diff --git a/jams-react-client/src/globalUrls.js b/jams-react-client/src/globalUrls.js
index d5e36808c09b931af867249ac851ab5839e89851..2cbb36e2961c637930ae0c7f66f41dfe1460acbe 100644
--- a/jams-react-client/src/globalUrls.js
+++ b/jams-react-client/src/globalUrls.js
@@ -1,97 +1,101 @@
-const uri = '';
+const uri = "";
const current_uri = window.location.href;
const backend_address = new URL(window.location.href);
const url_path = backend_address.protocol + "//" + backend_address.hostname;
const url_port = backend_address.port;
-const api_path_post_install_admin = '/api/install/start';
-const api_path_post_auth_login = '/api/login';
-const api_path_post_install_ca = '/api/install/ca';
-const api_path_post_install_auth = '/api/install/auth';
-const api_path_post_install_server = '/api/install/settings';
-const api_path_get_install_lastKnownStep = '/api/install/lastStep';
-const api_path_get_auth_user_search = '/api/auth/users';
-const api_path_get_admin_devices = '/api/admin/devices';
-const api_path_get_auth_devices = '/api/auth/devices';
-const api_path_delete_admin_user_revoke = '/api/admin/user';
-const api_path_delete_auth_user_revoke = '/api/auth/user';
-const api_path_delete_admin_device_revoke = '/api/admin/device';
-const api_path_delete_auth_device_revoke = '/api/auth/device';
-const api_path_rename_device = '/api/auth/device';
-const api_path_get_list_group = '/api/admin/group';
-const api_path_delete_group = '/api/admin/group';
-const api_path_put_update_group = '/api/admin/group';
-const api_path_get_server_status = '/api/info';
-const api_path_get_post_configuration_auth_service = '/api/configuration/authservice';
-const api_path_get_post_configuration_global_settings = '/api/configuration/globalsettings';
-const api_path_post_configuration_change_password = '/api/admin/user';
-const api_path_post_configuration_register_license = '/api/admin/subscription';
-const api_path_get_subscription_status = '/api/admin/subscription';
-const api_path_get_directories = '/api/auth/directories';
-const api_path_get_needs_update = '/api/admin/update';
-const api_path_get_start_update = '/api/admin/update';
-const api_path_post_create_group = '/api/admin/group';
-const api_path_post_create_user = '/api/admin/user';
-const api_path_put_update_user = '/api/admin/user';
-const api_path_get_auth_user = '/api/auth/user';
-const api_path_get_admin_user = '/api/admin/user';
-const api_path_post_update_user = '/api/auth/user';
-const api_path_get_exists_user = '/api/admin/user';
-const api_path_get_user_directory_search ='/api/auth/directory/search';
-const api_path_post_create_user_profile = '/api/admin/directory/entry';
-const api_path_put_update_user_profile = '/api/admin/directory/entry';
-const api_path_get_user_search = '/api/admin/users';
-const api_path_get_auth_contacts = '/api/auth/contacts';
-const api_path_get_admin_contacts = '/api/admin/contacts';
-const api_path_delete_auth_contacts = '/api/auth/contacts';
-const api_path_delete_admin_contacts = '/api/admin/contacts'
-const api_path_blueprints = '/api/admin/policy';
+const api_path_post_install_admin = "/api/install/start";
+const api_path_post_auth_login = "/api/login";
+const api_path_post_install_ca = "/api/install/ca";
+const api_path_post_install_auth = "/api/install/auth";
+const api_path_post_install_server = "/api/install/settings";
+const api_path_get_install_lastKnownStep = "/api/install/lastStep";
+const api_path_get_auth_user_search = "/api/auth/users";
+const api_path_get_admin_devices = "/api/admin/devices";
+const api_path_get_auth_devices = "/api/auth/devices";
+const api_path_delete_admin_user_revoke = "/api/admin/user";
+const api_path_delete_auth_user_revoke = "/api/auth/user";
+const api_path_delete_admin_device_revoke = "/api/admin/device";
+const api_path_delete_auth_device_revoke = "/api/auth/device";
+const api_path_rename_device = "/api/auth/device";
+const api_path_get_list_group = "/api/admin/group";
+const api_path_delete_group = "/api/admin/group";
+const api_path_put_update_group = "/api/admin/group";
+const api_path_get_server_status = "/api/info";
+const api_path_get_post_configuration_auth_service =
+ "/api/configuration/authservice";
+const api_path_get_post_configuration_global_settings =
+ "/api/configuration/globalsettings";
+const api_path_post_configuration_change_password = "/api/admin/user";
+const api_path_post_configuration_register_license = "/api/admin/subscription";
+const api_path_get_subscription_status = "/api/admin/subscription";
+const api_path_get_directories = "/api/auth/directories";
+const api_path_get_needs_update = "/api/admin/update";
+const api_path_get_start_update = "/api/admin/update";
+const api_path_post_create_group = "/api/admin/group";
+const api_path_post_create_user = "/api/admin/user";
+const api_path_put_update_user = "/api/admin/user";
+const api_path_get_auth_user = "/api/auth/user";
+const api_path_get_admin_user = "/api/admin/user";
+const api_path_post_update_user = "/api/auth/user";
+const api_path_get_exists_user = "/api/admin/user";
+const api_path_get_user_directory_search = "/api/auth/directory/search";
+const api_path_post_create_user_profile = "/api/admin/directory/entry";
+const api_path_put_update_user_profile = "/api/admin/directory/entry";
+const api_path_get_user_search = "/api/admin/users";
+const api_path_get_auth_contacts = "/api/auth/contacts";
+const api_path_get_admin_contacts = "/api/admin/contacts";
+const api_path_delete_auth_contacts = "/api/auth/contacts";
+const api_path_delete_admin_contacts = "/api/admin/contacts";
+const api_path_blueprints = "/api/admin/policy";
+const api_path_get_user_profile = "/api/auth/userprofile/";
module.exports = {
- uri,
- current_uri,
- backend_address,
- url_path,
- url_port,
- api_path_post_install_admin,
- api_path_post_auth_login,
- api_path_post_install_ca,
- api_path_post_install_auth,
- api_path_post_install_server,
- api_path_get_install_lastKnownStep,
- api_path_get_auth_user_search,
- api_path_get_admin_devices,
- api_path_get_auth_devices,
- api_path_delete_admin_user_revoke,
- api_path_delete_auth_user_revoke,
- api_path_delete_admin_device_revoke,
- api_path_delete_auth_device_revoke,
- api_path_rename_device,
- api_path_get_server_status,
- api_path_get_post_configuration_auth_service,
- api_path_get_post_configuration_global_settings,
- api_path_post_configuration_change_password,
- api_path_post_configuration_register_license,
- api_path_get_subscription_status,
- api_path_get_directories,
- api_path_get_needs_update,
- api_path_get_start_update,
- api_path_post_create_user,
- api_path_put_update_user,
- api_path_get_auth_user,
- api_path_get_admin_user,
- api_path_post_update_user,
- api_path_get_exists_user,
- api_path_get_user_directory_search,
- api_path_post_create_user_profile,
- api_path_put_update_user_profile,
- api_path_get_user_search,
- api_path_get_auth_contacts,
- api_path_get_admin_contacts,
- api_path_delete_auth_contacts,
- api_path_delete_admin_contacts,
- api_path_delete_group,
- api_path_get_list_group,
- api_path_post_create_group,
- api_path_put_update_group,
- api_path_blueprints
-}
\ No newline at end of file
+ uri,
+ current_uri,
+ backend_address,
+ url_path,
+ url_port,
+ api_path_post_install_admin,
+ api_path_post_auth_login,
+ api_path_post_install_ca,
+ api_path_post_install_auth,
+ api_path_post_install_server,
+ api_path_get_install_lastKnownStep,
+ api_path_get_auth_user_search,
+ api_path_get_admin_devices,
+ api_path_get_auth_devices,
+ api_path_delete_admin_user_revoke,
+ api_path_delete_auth_user_revoke,
+ api_path_delete_admin_device_revoke,
+ api_path_delete_auth_device_revoke,
+ api_path_rename_device,
+ api_path_get_server_status,
+ api_path_get_post_configuration_auth_service,
+ api_path_get_post_configuration_global_settings,
+ api_path_post_configuration_change_password,
+ api_path_post_configuration_register_license,
+ api_path_get_subscription_status,
+ api_path_get_directories,
+ api_path_get_needs_update,
+ api_path_get_start_update,
+ api_path_post_create_user,
+ api_path_put_update_user,
+ api_path_get_auth_user,
+ api_path_get_admin_user,
+ api_path_post_update_user,
+ api_path_get_exists_user,
+ api_path_get_user_directory_search,
+ api_path_post_create_user_profile,
+ api_path_put_update_user_profile,
+ api_path_get_user_search,
+ api_path_get_auth_contacts,
+ api_path_get_admin_contacts,
+ api_path_delete_auth_contacts,
+ api_path_delete_admin_contacts,
+ api_path_delete_group,
+ api_path_get_list_group,
+ api_path_post_create_group,
+ api_path_put_update_group,
+ api_path_blueprints,
+ api_path_get_user_profile,
+};
diff --git a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
index 8f4c076e5f8df9e7473f495ebaad609d53ca6ef8..5f273cb29d1adf02b7545538c4c636edf379c208 100644
--- a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
+++ b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
@@ -45,7 +45,7 @@ import configApiCall from "api.js";
import {
api_path_get_admin_user,
api_path_get_auth_user,
- api_path_get_user_directory_search,
+ api_path_get_user_profile,
api_path_delete_admin_user_revoke,
} from "globalUrls";
@@ -147,16 +147,12 @@ const useStyles = makeStyles(styles);
export default function DisplayUserProfile(props) {
const classes = useStyles();
- const [users, setUsers] = React.useState([]);
+ const [user, setUser] = React.useState([]);
const [userStatus, setUserStatus] = React.useState(false);
const [open, setOpen] = React.useState(false);
const [revokedUser, setRevokedUser] = React.useState("");
const [changePasswordOpen, setChangePasswordOpen] = React.useState(false);
- const searchData = {
- queryString: props.username,
- };
-
const userData = {
username: props.username,
};
@@ -188,17 +184,22 @@ export default function DisplayUserProfile(props) {
}
});
axios(
- configApiCall(api_path_get_user_directory_search, "GET", searchData, null)
+ configApiCall(
+ api_path_get_user_profile + props.username,
+ "GET",
+ null,
+ null
+ )
)
.then((response) => {
- setUsers(response.data);
+ setUser(response.data);
})
.catch((error) => {
console.log(error);
});
}, []);
- const getUserStatus = (user) => {
+ const getUserStatus = () => {
if (userStatus === false) {
return (
<Chip
@@ -284,181 +285,178 @@ export default function DisplayUserProfile(props) {
setChangePasswordOpen={setChangePasswordOpen}
handleClosechangePassword={handleClosechangePassword}
/>
- {users.map((user) => (
- <GridContainer>
- <Grid item xs={12} sm={12} md={8}>
- <Card profile>
- <CardBody profile>
- <div className={classes.root}>
- <Grid container spacing={2}>
- <Grid item xs={12} sm={12} md={6}>
- <CardAvatar displayProfile>
- <img
- src={
- user.profilePicture
- ? "data:image/png;base64, " + user.profilePicture
- : noProfilePicture
+ <GridContainer>
+ <Grid item xs={12} sm={12} md={8}>
+ <Card profile>
+ <CardBody profile>
+ <div className={classes.root}>
+ <Grid container spacing={2}>
+ <Grid item xs={12} sm={12} md={6}>
+ <CardAvatar displayProfile>
+ <img
+ src={
+ user.profilePicture
+ ? "data:image/png;base64, " + user.profilePicture
+ : noProfilePicture
+ }
+ className={classes.editProfilePicture}
+ alt="..."
+ />
+ </CardAvatar>
+ </Grid>
+ <Grid item xs={12} sm={12} md={6}>
+ <h3 className={classes.cardTitle}>
+ {user.username ? user.username : "no username"}
+ </h3>
+
+ {getUserStatus()}
+ </Grid>
+ <Grid item xs={12} sm={12} md={6}>
+ <List dense={false}>
+ <ListItem>
+ <ListItemAvatar>
+ <Avatar>
+ <PersonIcon />
+ </Avatar>
+ </ListItemAvatar>
+ <ListItemText
+ primary={
+ user.firstName ? user.firstName : "no firstname"
}
- className={classes.editProfilePicture}
- alt="..."
/>
- </CardAvatar>
- </Grid>
-
- <Grid item xs={12} sm={12} md={6}>
- <h3 className={classes.cardTitle}>
- {user.username ? user.username : "no username"}
- </h3>
-
- {getUserStatus(user)}
- </Grid>
- <Grid item xs={12} sm={12} md={6}>
- <List dense={false}>
- <ListItem>
- <ListItemAvatar>
- <Avatar>
- <PersonIcon />
- </Avatar>
- </ListItemAvatar>
- <ListItemText
- primary={
- user.firstName ? user.firstName : "no firstname"
- }
- />
- </ListItem>
- <ListItem>
- <ListItemAvatar>
- <Avatar>
- <PhoneInTalkOutlinedIcon />
- </Avatar>
- </ListItemAvatar>
- <ListItemText
- primary={
- user.phoneNumber
- ? user.phoneNumber
- : "no phone number"
- }
- />
- </ListItem>
- <ListItem>
- <ListItemAvatar>
- <Avatar>
- <AlternateEmailOutlinedIcon />
- </Avatar>
- </ListItemAvatar>
- <ListItemText
- primary={user.email ? user.email : "no email"}
- />
- </ListItem>
- <ListItem>
- <ListItemAvatar>
- <Avatar>
- <BusinessCenterOutlinedIcon />
- </Avatar>
- </ListItemAvatar>
- <ListItemText
- primary={
- user.organization
- ? user.organization
- : "no organization"
- }
- />
- </ListItem>
- </List>
- </Grid>
+ </ListItem>
+ <ListItem>
+ <ListItemAvatar>
+ <Avatar>
+ <PhoneInTalkOutlinedIcon />
+ </Avatar>
+ </ListItemAvatar>
+ <ListItemText
+ primary={
+ user.phoneNumber
+ ? user.phoneNumber
+ : "no phone number"
+ }
+ />
+ </ListItem>
+ <ListItem>
+ <ListItemAvatar>
+ <Avatar>
+ <AlternateEmailOutlinedIcon />
+ </Avatar>
+ </ListItemAvatar>
+ <ListItemText
+ primary={user.email ? user.email : "no email"}
+ />
+ </ListItem>
+ <ListItem>
+ <ListItemAvatar>
+ <Avatar>
+ <BusinessCenterOutlinedIcon />
+ </Avatar>
+ </ListItemAvatar>
+ <ListItemText
+ primary={
+ user.organization
+ ? user.organization
+ : "no organization"
+ }
+ />
+ </ListItem>
+ </List>
+ </Grid>
- <Grid item xs={12} sm={12} md={6}>
- <List dense={false}>
- <ListItem>
- <ListItemAvatar>
- <Avatar>
- <PersonOutlinedIcon />
- </Avatar>
- </ListItemAvatar>
- <ListItemText
- primary={
- user.lastName ? user.lastName : "no lastname"
- }
- />
- </ListItem>
- <ListItem>
- <ListItemAvatar>
- <Avatar>
- <PhoneForwardedOutlinedIcon />
- </Avatar>
- </ListItemAvatar>
- <ListItemText
- primary={
- user.phoneNumberExtension
- ? user.phoneNumberExtension
- : "no Extension"
- }
- />
- </ListItem>
- <ListItem>
- <ListItemAvatar>
- <Avatar>
- <SmartphoneOutlinedIcon />
- </Avatar>
- </ListItemAvatar>
- <ListItemText
- primary={
- user.mobileNumber
- ? user.mobileNumber
- : "no mobile number"
- }
- />
- </ListItem>
- <ListItem>
- <ListItemAvatar>
- <Avatar>
- <LocalPrintshopOutlinedIcon />
- </Avatar>
- </ListItemAvatar>
- <ListItemText
- primary={
- user.faxNumber ? user.faxNumber : "no fax number"
- }
- />
- </ListItem>
- </List>
- </Grid>
+ <Grid item xs={12} sm={12} md={6}>
+ <List dense={false}>
+ <ListItem>
+ <ListItemAvatar>
+ <Avatar>
+ <PersonOutlinedIcon />
+ </Avatar>
+ </ListItemAvatar>
+ <ListItemText
+ primary={
+ user.lastName ? user.lastName : "no lastname"
+ }
+ />
+ </ListItem>
+ <ListItem>
+ <ListItemAvatar>
+ <Avatar>
+ <PhoneForwardedOutlinedIcon />
+ </Avatar>
+ </ListItemAvatar>
+ <ListItemText
+ primary={
+ user.phoneNumberExtension
+ ? user.phoneNumberExtension
+ : "no Extension"
+ }
+ />
+ </ListItem>
+ <ListItem>
+ <ListItemAvatar>
+ <Avatar>
+ <SmartphoneOutlinedIcon />
+ </Avatar>
+ </ListItemAvatar>
+ <ListItemText
+ primary={
+ user.mobileNumber
+ ? user.mobileNumber
+ : "no mobile number"
+ }
+ />
+ </ListItem>
+ <ListItem>
+ <ListItemAvatar>
+ <Avatar>
+ <LocalPrintshopOutlinedIcon />
+ </Avatar>
+ </ListItemAvatar>
+ <ListItemText
+ primary={
+ user.faxNumber ? user.faxNumber : "no fax number"
+ }
+ />
+ </ListItem>
+ </List>
</Grid>
- </div>
- </CardBody>
- <CardFooter>
- {auth.isLocalDirectory() && (
- <Button
- color="info"
- onClick={() => props.setDisplayUser(false)}
- >
- <EditIcon /> Edit Profile
- </Button>
- )}
- {auth.isLocalDirectory() && auth.hasAdminScope() && (
+ </Grid>
+ </div>
+ </CardBody>
+ <CardFooter>
+ {auth.isLocalDirectory() && (
+ <Button
+ color="info"
+ onClick={() => props.setDisplayUser(false)}
+ >
+ <EditIcon /> Edit Profile
+ </Button>
+ )}
+ {auth.isLocalDirectory() && auth.hasAdminScope() && (
+ <Button
+ color="info"
+ onClick={() => {
+ setChangePasswordOpen(true);
+ }}
+ >
+ <VpnKeyIcon /> Change password
+ </Button>
+ )}
+ {auth.hasAdminScope() &&
+ (userStatus === "Active" || userStatus === "") && (
<Button
color="info"
- onClick={() => {
- setChangePasswordOpen(true);
- }}
+ onClick={() => handleClickOpen(user.username)}
>
- <VpnKeyIcon /> Change password
+ <DeleteIcon fontSize="small" /> Revoke user
</Button>
)}
- {auth.hasAdminScope() &&
- (userStatus === "Active" || userStatus === "") && (
- <Button
- color="info"
- onClick={() => handleClickOpen(user.username)}
- >
- <DeleteIcon fontSize="small" /> Revoke user
- </Button>
- )}
- </CardFooter>
- </Card>
- </Grid>
- </GridContainer>
- ))}
+ </CardFooter>
+ </Card>
+ </Grid>
+ </GridContainer>
</div>
);
}
diff --git a/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js b/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
index e14a4103a261af8d10dbe83964cbcdd6e843f68d..420529cc64ce13b3f9da548e1cc1a780289ce855 100644
--- a/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
+++ b/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
@@ -60,7 +60,7 @@ import {
api_path_put_update_user_profile,
api_path_post_create_user,
api_path_post_create_user_profile,
- api_path_get_user_directory_search,
+ api_path_get_user_profile,
api_path_get_exists_user,
} from "../../globalUrls";
@@ -191,29 +191,28 @@ export default function EditCreateUserProfile(props) {
setUserName(props.username);
axios(
configApiCall(
- api_path_get_user_directory_search,
+ api_path_get_user_profile + props.username,
"GET",
- { queryString: props.username },
+ null,
null
)
)
.then((response) => {
- response.data.map((user) => {
- initialValues.username = user.username;
- initialValues.firstName = user.firstName;
- initialValues.lastName = user.lastName;
- initialValues.email = user.email;
- initialValues.profilePicture = user.profilePicture;
- setProfilePicture(user.profilePicture);
- setProfilePicturePreview(
- "data:image/png;base64, " + user.profilePicture
- );
- initialValues.organization = user.organization;
- initialValues.faxNumber = user.faxNumber;
- initialValues.phoneNumber = user.phoneNumber;
- initialValues.phoneNumberExtension = user.phoneNumberExtension;
- initialValues.mobileNumber = user.mobileNumber;
- });
+ const user = response.data;
+ initialValues.username = user.username;
+ initialValues.firstName = user.firstName;
+ initialValues.lastName = user.lastName;
+ initialValues.email = user.email;
+ initialValues.profilePicture = user.profilePicture;
+ setProfilePicture(user.profilePicture);
+ setProfilePicturePreview(
+ "data:image/png;base64, " + user.profilePicture
+ );
+ initialValues.organization = user.organization;
+ initialValues.faxNumber = user.faxNumber;
+ initialValues.phoneNumber = user.phoneNumber;
+ initialValues.phoneNumberExtension = user.phoneNumberExtension;
+ initialValues.mobileNumber = user.mobileNumber;
})
.catch((error) => {
console.log("Error fetching user : " + props.username + " " + error);