Fix #12 Added possibility to add users

Signed-off-by: Sascha Pfeiffer <sascha.pfeiffer@psono.com>

Author: Sascha Pfeiffer

public/locales/de/translation.json

@@ -1,4 +1,8 @@
 {
+  "USER_LIMIT_REACHED": "Benutzer Limit erreicht",
+  "LICENSE_EXPIRED": "Lizenz abgelaufen",
+  "USER_WITH_EMAIL_ALREADY_EXISTS": "Email bereits vergeben",
+  "USER_WITH_USERNAME_ALREADY_EXISTS": "Benutzername bereits vergeben",
   "DELETE_USER_CONFIRM_DIALOG": "Sie sind dabei Benutzer zu löschen. Sind sie sich sicher?",
   "DELETE_GROUP_CONFIRM_DIALOG": "Sie sind dabei Gruppen zu löschen. Sind sie sich sicher?",
   "ABORT": "Abbrechen",
@@ -87,6 +91,7 @@
   "FILESERVER_INFO": "Fileserver Info:",
   "TITLE": "Title",
   "GROUP_NAME": "Gruppen Name",
+  "CREATE_USER": "Benutzer Erstellen",
   "CREATE_GROUP": "Gruppe Erstellen",
   "ADD_NECESSARY_DETAILS_BELOW": "Geben sie die notwendigen Details unten an",
   "VERSION": "Version",
@@ -238,6 +243,7 @@
   "LOGIN": "Login",
   "USERNAME": "Benutzername",
   "PASSWORD": "Passwort",
+  "PASSWORD_REPEAT": "Passwort (wiederholen)",
   "REQUEST_PASSWORD_RESET": "Passwort Zurücksetzen",
   "LOST_PASSWORD": "Passwort verloren",
   "PRIVACY_POLICY": "Datenschutz",

public/locales/en/translation.json

@@ -1,4 +1,8 @@
 {
+  "USER_LIMIT_REACHED": "User limit reached",
+  "LICENSE_EXPIRED": "License expired",
+  "USER_WITH_EMAIL_ALREADY_EXISTS": "Email address already taken",
+  "USER_WITH_USERNAME_ALREADY_EXISTS": "Username already taken",
   "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",
@@ -87,6 +91,7 @@
   "FILESERVER_INFO": "Fileserver Info:",
   "TITLE": "Title",
   "GROUP_NAME": "Group Name",
+  "CREATE_USER": "Create User",
   "CREATE_GROUP": "Create Group",
   "ADD_NECESSARY_DETAILS_BELOW": "Add the necessary details below",
   "VERSION": "Version",
@@ -238,6 +243,7 @@
   "LOGIN": "Login",
   "USERNAME": "Username",
   "PASSWORD": "Password",
+  "PASSWORD_REPEAT": "Password (repeat)",
   "REQUEST_PASSWORD_RESET": "Request Password Reset",
   "LOST_PASSWORD": "Lost password",
   "PRIVACY_POLICY": "Privacy Policy",

src/components/Card/UsersCard.jsx

@@ -38,6 +38,7 @@ class UsersCard extends React.Component {
             onDeleteSessions,
             onDeleteGroups,
             onCreateGroup,
+            onCreateUser,
             show_create_group_button
         } = this.props;
         return (
@@ -146,6 +147,12 @@ class UsersCard extends React.Component {
                                                     deleteUsers: [data]
                                                 });
                                             }
+                                        },
+                                        {
+                                            tooltip: t('CREATE_USER'),
+                                            isFreeAction: true,
+                                            icon: Add,
+                                            onClick: evt => onCreateUser()
                                         }
                                     ]}
                                 />

src/components/Table/CustomMaterialTable.jsx

@@ -72,66 +72,74 @@ class CustomMaterialTable extends React.Component {
         const mergedOptions = { ...defaultOptions, ...options };
 
         return (
-            <MaterialTable
-                icons={tableIcons}
-                title={title}
-                columns={columns}
-                data={data}
-                options={mergedOptions}
-                actions={actions}
-                localization={{
-                    body: {
-                        emptyDataSourceMessage: t(
-                            'MATERIAL_TABLE_NO_RECORD_TO_DISPLAY'
-                        ),
-                        addTooltip: t('MATERIAL_TABLE_ADD'),
-                        deleteTooltip: t('MATERIAL_TABLE_DELETE'),
-                        editTooltip: t('MATERIAL_TABLE_EDIT'),
-                        filterRow: {
-                            filterTooltip: t('MATERIAL_TABLE_FILTER')
+            <div>
+                <MaterialTable
+                    icons={tableIcons}
+                    title={title}
+                    columns={columns}
+                    data={data}
+                    options={mergedOptions}
+                    actions={actions}
+                    localization={{
+                        body: {
+                            emptyDataSourceMessage: t(
+                                'MATERIAL_TABLE_NO_RECORD_TO_DISPLAY'
+                            ),
+                            addTooltip: t('MATERIAL_TABLE_ADD'),
+                            deleteTooltip: t('MATERIAL_TABLE_DELETE'),
+                            editTooltip: t('MATERIAL_TABLE_EDIT'),
+                            filterRow: {
+                                filterTooltip: t('MATERIAL_TABLE_FILTER')
+                            },
+                            editRow: {
+                                deleteText: t(
+                                    'MATERIAL_TABLE_ARE_YOU_SURE_DELETE_THIS_ROW'
+                                ),
+                                cancelTooltip: t('MATERIAL_TABLE_CANCEL'),
+                                saveTooltip: t('MATERIAL_TABLE_SAVE')
+                            }
+                        },
+                        grouping: {
+                            placeholder: t('MATERIAL_TABLE_DRAG_HEADERS')
                         },
-                        editRow: {
-                            deleteText: t(
-                                'MATERIAL_TABLE_ARE_YOU_SURE_DELETE_THIS_ROW'
+                        header: {
+                            actions: t('MATERIAL_TABLE_ACTIONS')
+                        },
+                        pagination: {
+                            labelDisplayedRows: t(
+                                'MATERIAL_TABLE_FROM_TO_COUNT'
+                            ),
+                            labelRowsSelect: t('MATERIAL_TABLE_ROWS'),
+                            labelRowsPerPage: t('MATERIAL_TABLE_ROWS_PER_PAGE'),
+                            firstAriaLabel: t('MATERIAL_TABLE_FIRST_PAGE'),
+                            firstTooltip: t('MATERIAL_TABLE_FIRST_PAGE'),
+                            previousAriaLabel: t(
+                                'MATERIAL_TABLE_PREVIOUS_PAGE'
+                            ),
+                            previousTooltip: t('MATERIAL_TABLE_PREVIOUS_PAGE'),
+                            nextAriaLabel: t('MATERIAL_TABLE_NEXT_PAGE'),
+                            nextTooltip: t('MATERIAL_TABLE_NEXT_PAGE'),
+                            lastAriaLabel: t('MATERIAL_TABLE_LAST_PAGE'),
+                            lastTooltip: t('MATERIAL_TABLE_LAST_PAGE')
+                        },
+                        toolbar: {
+                            addRemoveColumns: t(
+                                'MATERIAL_TABLE_ADD_OR_REMOVE_COLUMNS'
+                            ),
+                            nRowsSelected: t('MATERIAL_TABLE_N_ROWS_SELECTED'),
+                            showColumnsTitle: t('MATERIAL_TABLE_SHOW_COLUMNS'),
+                            showColumnsAriaLabel: t(
+                                'MATERIAL_TABLE_SHOW_COLUMNS'
                             ),
-                            cancelTooltip: t('MATERIAL_TABLE_CANCEL'),
-                            saveTooltip: t('MATERIAL_TABLE_SAVE')
+                            exportTitle: t('MATERIAL_TABLE_EXPORT'),
+                            exportAriaLabel: t('MATERIAL_TABLE_EXPORT'),
+                            exportName: t('MATERIAL_TABLE_EXPORT_AS_CSV'),
+                            searchTooltip: t('MATERIAL_TABLE_SEARCH'),
+                            searchPlaceholder: t('MATERIAL_TABLE_SEARCH')
                         }
-                    },
-                    grouping: {
-                        placeholder: t('MATERIAL_TABLE_DRAG_HEADERS')
-                    },
-                    header: {
-                        actions: t('MATERIAL_TABLE_ACTIONS')
-                    },
-                    pagination: {
-                        labelDisplayedRows: t('MATERIAL_TABLE_FROM_TO_COUNT'),
-                        labelRowsSelect: t('MATERIAL_TABLE_ROWS'),
-                        labelRowsPerPage: t('MATERIAL_TABLE_ROWS_PER_PAGE'),
-                        firstAriaLabel: t('MATERIAL_TABLE_FIRST_PAGE'),
-                        firstTooltip: t('MATERIAL_TABLE_FIRST_PAGE'),
-                        previousAriaLabel: t('MATERIAL_TABLE_PREVIOUS_PAGE'),
-                        previousTooltip: t('MATERIAL_TABLE_PREVIOUS_PAGE'),
-                        nextAriaLabel: t('MATERIAL_TABLE_NEXT_PAGE'),
-                        nextTooltip: t('MATERIAL_TABLE_NEXT_PAGE'),
-                        lastAriaLabel: t('MATERIAL_TABLE_LAST_PAGE'),
-                        lastTooltip: t('MATERIAL_TABLE_LAST_PAGE')
-                    },
-                    toolbar: {
-                        addRemoveColumns: t(
-                            'MATERIAL_TABLE_ADD_OR_REMOVE_COLUMNS'
-                        ),
-                        nRowsSelected: t('MATERIAL_TABLE_N_ROWS_SELECTED'),
-                        showColumnsTitle: t('MATERIAL_TABLE_SHOW_COLUMNS'),
-                        showColumnsAriaLabel: t('MATERIAL_TABLE_SHOW_COLUMNS'),
-                        exportTitle: t('MATERIAL_TABLE_EXPORT'),
-                        exportAriaLabel: t('MATERIAL_TABLE_EXPORT'),
-                        exportName: t('MATERIAL_TABLE_EXPORT_AS_CSV'),
-                        searchTooltip: t('MATERIAL_TABLE_SEARCH'),
-                        searchPlaceholder: t('MATERIAL_TABLE_SEARCH')
-                    }
-                }}
-            />
+                    }}
+                />
+            </div>
         );
     }
 }

src/routes/other.jsx

@@ -2,6 +2,7 @@ import SecurityReportEdit from '../views/SecurityReport/Edit';
 import UserEdit from '../views/User/Edit';
 import GroupEdit from '../views/Group/Edit';
 import GroupCreate from '../views/Group/Create';
+import UserCreate from '../views/User/Create';
 
 import { Person, Group, Timeline } from '@material-ui/icons';
 
@@ -31,8 +32,15 @@ let routes = [
         path: '/groups/create',
         sidebarName: 'CREATE_GROUP',
         navbarName: 'CREATE_GROUP',
-        icon: Person,
+        icon: Group,
         component: GroupCreate
+    },
+    {
+        path: '/users/create',
+        sidebarName: 'CREATE_USER',
+        navbarName: 'CREATE_USER',
+        icon: Person,
+        component: UserCreate
     }
 ];
 

src/services/api-server.js

@@ -509,6 +509,38 @@ function admin_saml_delete_group_map(
     return call(connection_type, endpoint, data, headers, session_secret_key);
 }
 
+/**
+ * POST: Creates 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 {string} username The name of the user to create
+ * @param {string} email The email of the user to create
+ * @param {string} password The password of the user to create
+ *
+ * @returns {Promise<AxiosResponse<any>>}
+ */
+function admin_create_user(
+    token,
+    session_secret_key,
+    username,
+    password,
+    email
+) {
+    const endpoint = '/admin/user/';
+    const connection_type = 'POST';
+    const data = {
+        username: username,
+        email: email,
+        password: password
+    };
+    const headers = {
+        Authorization: 'Token ' + token
+    };
+
+    return call(connection_type, endpoint, data, headers, session_secret_key);
+}
+
 /**
  * DELETE: Deletes a user (for administrators)
  *
@@ -561,7 +593,7 @@ function admin_delete_session(token, session_secret_key, session_id) {
  *
  * @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} name The name of the group to create
+ * @param {string} name The name of the group to create
  *
  * @returns {Promise<AxiosResponse<any>>}
  */
@@ -2572,6 +2604,7 @@ const service = {
     admin_session,
     admin_group,
     admin_security_report,
+    admin_create_user,
     admin_delete_user,
     admin_delete_session,
     admin_create_group,

src/views/Group/Create.js

@@ -8,12 +8,13 @@ import {
     RegularCard,
     CustomInput,
     GridItem,
-    Button
+    Button,
+    SnackbarContent
 } from '../../components/index';
 import psono_server from '../../services/api-server';
 import customInputStyle from '../../assets/jss/material-dashboard-react/customInputStyle';
 
-class User extends React.Component {
+class Group extends React.Component {
     state = {
         errors_list: [],
         errors_dict: {},
@@ -106,13 +107,29 @@ class User extends React.Component {
                                 </div>
                             }
                             footer={
-                                <Button
-                                    color="primary"
-                                    onClick={this.createGroup}
-                                    disabled={!this.state.createGroupPossible}
-                                >
-                                    {t('CREATE_GROUP')}
-                                </Button>
+                                <div>
+                                    <Button
+                                        color="primary"
+                                        onClick={this.createGroup}
+                                        disabled={
+                                            !this.state.createGroupPossible
+                                        }
+                                    >
+                                        {t('CREATE_GROUP')}
+                                    </Button>
+                                    {errors_dict.hasOwnProperty(
+                                        'non_field_errors'
+                                    ) ? (
+                                        <SnackbarContent
+                                            message={t(
+                                                errors_dict['non_field_errors']
+                                            )}
+                                            color="danger"
+                                        />
+                                    ) : (
+                                        ''
+                                    )}
+                                </div>
                             }
                         />
                     </GridItem>
@@ -122,4 +139,4 @@ class User extends React.Component {
     }
 }
 
-export default compose(withTranslation(), withStyles(customInputStyle))(User);
+export default compose(withTranslation(), withStyles(customInputStyle))(Group);