Merge branch 'develop' into 'master'

Preparing v1.7.14

See merge request psono/psono-admin-client!72

Author: Sascha Pfeiffer

public/locales/en/translation.json

@@ -93,6 +93,7 @@
   "DELETE_OIDC_GROUP_CONFIRM_DIALOG": "You are about to delete OIDC groups. Are you sure?",
   "DELETE_SAML_GROUP_CONFIRM_DIALOG": "You are about to delete SAML groups. Are you sure?",
   "DELETE_SCIM_GROUP_CONFIRM_DIALOG": "You are about to delete SCIM groups. Are you sure?",
+  "WIPE_USER_CONFIRM_DIALOG": "You are about to wipe users. The users will be resetted and all their data will be lost. Are you sure?",
   "DELETE_USER_CONFIRM_DIALOG": "You are about to delete users. Are you sure?",
   "DELETE_GROUP_CONFIRM_DIALOG": "You are about to delete groups. Are you sure?",
   "ABORT": "Abort",
@@ -233,6 +234,7 @@
   "MEMBERS": "Members",
   "MANAGED": "Managed",
   "EMAIL_ACTIVE": "E-Mail active",
+  "WIPE_USER_S": "Wipe user(s)",
   "DELETE_USER_S": "Delete user(s)",
   "DELETE_LDAP_GROUP_S": "Delete LDAP group(s)",
   "DELETE_OIDC_GROUP_S": "Delete OIDC group(s)",

src/containers/Index/Index.js

@@ -59,24 +59,24 @@ const App = (props) => {
     const { classes, ...rest } = props;
 
     let variableLinks = [];
-    if (props.state.server.type === 'EE') {
+    if (store.getState().server.type === 'EE') {
         eeLinks.forEach((link) => variableLinks.push(link));
     }
     if (
-        props.state.server.type === 'EE' &&
-        props.state.server.authentication_methods.includes('LDAP')
+        store.getState().server.type === 'EE' &&
+        store.getState().server.authentication_methods.includes('LDAP')
     ) {
         ldapLinks.forEach((link) => variableLinks.push(link));
     }
     if (
-        props.state.server.type === 'EE' &&
-        props.state.server.authentication_methods.includes('SAML')
+        store.getState().server.type === 'EE' &&
+        store.getState().server.authentication_methods.includes('SAML')
     ) {
         samlLinks.forEach((link) => variableLinks.push(link));
     }
     if (
-        props.state.server.type === 'EE' &&
-        props.state.server.authentication_methods.includes('OIDC')
+        store.getState().server.type === 'EE' &&
+        store.getState().server.authentication_methods.includes('OIDC')
     ) {
         oidcLinks.forEach((link) => variableLinks.push(link));
     }

src/services/api-server.js

@@ -1046,6 +1046,29 @@ function admin_delete_user(token, session_secret_key, user_id) {
     return call(method, endpoint, data, headers, session_secret_key);
 }
 
+/**
+ * POST: Wipes a user (for administrators)
+ *
+ * @param {string} token authentication token of the user, returned by authentication_login(email, authkey)
+ * @param {string} session_secret_key The session secret key
+ * @param {uuid} user_id The user id of the user to delete
+ *
+ * @returns {Promise<AxiosResponse<any>>}
+ */
+function admin_wipe_user(token, session_secret_key, user_id) {
+    const endpoint = '/admin/user-wipe/';
+    const method = 'POST';
+    const data = {
+        user_id: user_id,
+    };
+    const headers = {
+        'Content-Type': 'application/json',
+        Authorization: 'Token ' + token,
+    };
+
+    return call(method, endpoint, data, headers, session_secret_key);
+}
+
 /**
  * DELETE: Deletes a session (for administrators)
  *
@@ -3643,6 +3666,7 @@ const service = {
     admin_security_report,
     admin_create_user,
     admin_delete_user,
+    admin_wipe_user,
     admin_delete_session,
     admin_policy,
     admin_policy_create_group_map,

src/views/Group/Create.js

@@ -26,7 +26,7 @@ const GroupCreate = (props) => {
     const [autoCreateFolder, setAutoCreateFolder] = useState(false);
 
     React.useEffect(() => {
-        const is_ee_server = props.state.server.type === 'EE';
+        const is_ee_server = store.getState().server.type === 'EE';
 
         if (!is_ee_server) {
             setRedirectTo('/dashboard');

src/views/User/Edit.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useParams } from 'react-router-dom';
+import { useHistory, useParams } from 'react-router-dom';
 import moment from 'moment';
 
 import { makeStyles } from '@material-ui/core/styles';
@@ -18,15 +18,19 @@ import {
 import psono_server from '../../services/api-server';
 import customInputStyle from '../../assets/jss/material-dashboard-react/customInputStyle';
 import store from '../../services/store';
+import DeleteConfirmDialog from '../../components/Dialog/DeleteConfirmDialog';
 
 const useStyles = makeStyles(customInputStyle);
 const UserEdit = () => {
     const classes = useStyles();
     const { t } = useTranslation();
+    const history = useHistory();
     const { user_id } = useParams();
     const [user, setUser] = useState(null);
     const [errors, setErrors] = useState([]);
     const [msgs, setMsgs] = useState([]);
+    const [deleteUserModalOpen, setDeleteUserModalOpen] = useState(false);
+    const [wipeUserModalOpen, setWipeUserModalOpen] = useState(false);
 
     React.useEffect(() => {
         loadUser();
@@ -448,6 +452,50 @@ const UserEdit = () => {
 
     return (
         <div>
+            {deleteUserModalOpen && (
+                <DeleteConfirmDialog
+                    title={t('DELETE_USER_S')}
+                    onConfirm={() => {
+                        psono_server
+                            .admin_delete_user(
+                                store.getState().user.token,
+                                store.getState().user.session_secret_key,
+                                user.id
+                            )
+                            .then(() => {
+                                history.push('/user/');
+                            });
+                        setDeleteUserModalOpen(false);
+                    }}
+                    onAbort={() => {
+                        setDeleteUserModalOpen(false);
+                    }}
+                >
+                    {t('DELETE_USER_CONFIRM_DIALOG')}
+                </DeleteConfirmDialog>
+            )}
+            {wipeUserModalOpen && (
+                <DeleteConfirmDialog
+                    title={t('WIPE_USER_S')}
+                    onConfirm={() => {
+                        psono_server
+                            .admin_wipe_user(
+                                store.getState().user.token,
+                                store.getState().user.session_secret_key,
+                                user.id
+                            )
+                            .then(() => {
+                                history.push('/user/');
+                            });
+                        setWipeUserModalOpen(false);
+                    }}
+                    onAbort={() => {
+                        setWipeUserModalOpen(false);
+                    }}
+                >
+                    {t('WIPE_USER_CONFIRM_DIALOG')}
+                </DeleteConfirmDialog>
+            )}
             <Grid container>
                 <GridItem xs={12} sm={12} md={12}>
                     <RegularCard
@@ -599,9 +647,26 @@ const UserEdit = () => {
                             </div>
                         }
                         footer={
-                            <Button color="primary" onClick={save}>
-                                {t('SAVE')}
-                            </Button>
+                            <>
+                                <Button color="primary" onClick={save}>
+                                    {t('SAVE')}
+                                </Button>
+                                <Button
+                                    onClick={() => setDeleteUserModalOpen(true)}
+                                >
+                                    {t('DELETE')}
+                                </Button>
+                                {store.getState().server.type == 'EE' &&
+                                    user.authentication !== 'AUTHKEY' && (
+                                        <Button
+                                            onClick={() =>
+                                                setWipeUserModalOpen(true)
+                                            }
+                                        >
+                                            {t('WIPE')}
+                                        </Button>
+                                    )}
+                            </>
                         }
                     />
                 </GridItem>