Skip to content
Snippets Groups Projects
Commit 02b8c674 authored by Larbi Gharib's avatar Larbi Gharib
Browse files

Lookup endpoint user 

Change-Id: Idc869e61bd47d7923f42a9a3bfe891f34eae3488
parent ec5f9082
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
jams-react-client/src/globalUrls.js
+ 95
− 91
View file @ 02b8c674
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,
......@@ -93,5 +96,6 @@ module.exports = {
api_path_get_list_group,
api_path_post_create_group,
api_path_put_update_group,
api_path_blueprints
}
\ No newline at end of file
api_path_blueprints,
api_path_get_user_profile,
};
jams-react-client/src/views/UserProfile/DisplayUserProfile.js
+ 173
− 175
View file @ 02b8c674
......@@ -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,7 +285,6 @@ export default function DisplayUserProfile(props) {
setChangePasswordOpen={setChangePasswordOpen}
handleClosechangePassword={handleClosechangePassword}
/>
{users.map((user) => (
<GridContainer>
<Grid item xs={12} sm={12} md={8}>
<Card profile>
......@@ -304,13 +304,12 @@ export default function DisplayUserProfile(props) {
/>
</CardAvatar>
</Grid>
<Grid item xs={12} sm={12} md={6}>
<h3 className={classes.cardTitle}>
{user.username ? user.username : "no username"}
</h3>
{getUserStatus(user)}
{getUserStatus()}
</Grid>
<Grid item xs={12} sm={12} md={6}>
<List dense={false}>
......@@ -458,7 +457,6 @@ export default function DisplayUserProfile(props) {
</Card>
</Grid>
</GridContainer>
))}
</div>
);
}
jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
+ 18
− 19
View file @ 02b8c674
......@@ -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,14 +191,14 @@ 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) => {
const user = response.data;
initialValues.username = user.username;
initialValues.firstName = user.firstName;
initialValues.lastName = user.lastName;
......@@ -213,7 +213,6 @@ export default function EditCreateUserProfile(props) {
initialValues.phoneNumber = user.phoneNumber;
initialValues.phoneNumberExtension = user.phoneNumberExtension;
initialValues.mobileNumber = user.mobileNumber;
});
})
.catch((error) => {
console.log("Error fetching user : " + props.username + " " + error);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment