Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create Users Table Skeleton #44

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions backend/typescript/services/implementations/authService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,13 @@ class AuthService implements IAuthService {
decodedIdToken.uid,
);

const firebaseUser = await firebaseAdmin
.auth()
.getUser(decodedIdToken.uid);
// TODO: Uncomment when the email verification is working
// const firebaseUser = await firebaseAdmin
// .auth()
// .getUser(decodedIdToken.uid);

return firebaseUser.emailVerified && roles.has(userRole);
// return firebaseUser.emailVerified && roles.has(userRole);
return roles.has(userRole);
} catch (error) {
return false;
}
Expand Down
21 changes: 21 additions & 0 deletions frontend/src/APIClients/UserAPIClient.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { User } from "../types/UserTypes";
import AUTHENTICATED_USER_KEY from "../constants/AuthConstants";
import baseAPIClient from "./BaseAPIClient";
import { getLocalStorageObjProperty } from "../utils/LocalStorageUtils";

const get = async (): Promise<User[]> => {
const bearerToken = `Bearer ${getLocalStorageObjProperty(
AUTHENTICATED_USER_KEY,
"accessToken",
)}`;
try {
const { data } = await baseAPIClient.get("/users", {
headers: { Authorization: bearerToken },
});
return data;
} catch (error) {
throw new Error(`Failed to get entity: ${error}`);
}
};

export default { get };
61 changes: 57 additions & 4 deletions frontend/src/components/pages/UserManagementPage.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,64 @@
import React from "react";
import React, { useEffect, useState } from "react";
import {
Table,
Thead,
Tbody,
Tr,
Th,
Td,
TableContainer,
VStack,
Button,
} from "@chakra-ui/react";
import UserAPIClient from "../../APIClients/UserAPIClient";
import { User } from "../../types/UserTypes";
import MainPageButton from "../common/MainPageButton";

const UserManagementPage = (): React.ReactElement => {
const [users, setUsers] = useState<User[]>([]);

const getUsers = async () => {
try {
const fetchedUsers = await UserAPIClient.get();
if (fetchedUsers != null) {
setUsers(fetchedUsers);
}
} catch (error) {
/* empty */
}
};

useEffect(() => {
getUsers();
}, []);

return (
<div style={{ textAlign: "center", width: "25%", margin: "0px auto" }}>
<h1>User Management</h1>
<MainPageButton />
<div style={{ textAlign: "center", width: "75%", margin: "0px auto" }}>
<h1>Team Members Page</h1>
<VStack spacing="24px" style={{ margin: "24px auto" }}>
<TableContainer>
<Table variant="simple">
<Thead>
<Tr>
<Th>First Name</Th>
<Th>Last Name</Th>
<Th>Role</Th>
</Tr>
</Thead>
<Tbody>
{users.map((user) => (
<Tr key={user.id}>
<Td>{user.firstName}</Td>
<Td>{user.lastName}</Td>
<Td>{user.role}</Td>
</Tr>
))}
</Tbody>
</Table>
</TableContainer>
<Button onClick={getUsers}>Refresh</Button>
<MainPageButton />
</VStack>
</div>
);
};
Expand Down
8 changes: 8 additions & 0 deletions frontend/src/types/UserTypes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export type User = {
id: number;
firstName: string;
lastName: string;
email: string;
role: string;
status: string;
};
Loading