Skip to content

Hook to verify user settings and session validity #107

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.

Sign up for GitHub

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

Merged
ddelpiano merged 5 commits into from
May 23, 2025
Merged

Hook to verify user settings and session validity #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f607b67
adding hook to check user data
ddelpiano May 23, 2025
521371a
aligning user and session check across components
ddelpiano May 23, 2025
181d7ef
aligning user and session check across components 2
ddelpiano May 23, 2025
6d003f9
aligning user and session check across components 3
ddelpiano May 23, 2025
1f8b0ad
replacing href with navigate to keep the app state
ddelpiano May 23, 2025
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
93 changes: 59 additions & 34 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
useLocation,
} from "react-router-dom";
import theme from "./theme";
import PropTypes from 'prop-types';
import PropTypes from "prop-types";
import Header from "./components/Header";
import Footer from "./components/Footer";
import Login from "./components/Auth/Login";
Expand All @@ -27,8 +27,10 @@ import TermActivity from "./components/term_activity/TermActivity";
import OrganizationsCurieEditor from "./components/CurieEditor/OrganizationCurieEditor";
import { handleOrcidLogin } from "./api/endpoints";
import { GlobalDataContext } from "./contexts/DataContext";
import { useCookies } from 'react-cookie'
import { API_CONFIG } from "./config";
import { requestUserSettings } from "./components/Auth/utils";
import { useCookies } from 'react-cookie';


const PageContainer = ({ children }) => {
return (
Expand All @@ -39,29 +41,37 @@ const PageContainer = ({ children }) => {
};

function MainContent() {
const [cookies] = useCookies(['session'])
const cookiesInfo = JSON.parse(localStorage.getItem(API_CONFIG.SESSION_DATA.COOKIE));
const { user, setUserData } = useContext(GlobalDataContext);

// check if cookie is expired
if (!user) {
const sessionCookie = cookies.session;
const expires = new Date(cookiesInfo?.expires);
const today = new Date();
if (sessionCookie === cookiesInfo?.value && expires > today) {
const userData = JSON.parse(localStorage.getItem(API_CONFIG.SESSION_DATA.SETTINGS));
setUserData({
name: userData['groupname'],
id: userData['orcid'],
email: userData?.emails[0]?.email,
role: userData['own-role'],
groupname: userData['groupname'],
settings: userData
});
} else {
setUserData({});
}
}
const { setUserData } = useContext(GlobalDataContext);
// eslint-disable-next-line no-unused-vars
const [existingCookies, setCookie, removeCookie] = useCookies(['session']);

useEffect(() => {
(async () => {
const userSettings = JSON.parse(
localStorage.getItem(API_CONFIG.SESSION_DATA.SETTINGS)
);
if (userSettings) {
try {
const userData = await requestUserSettings(userSettings?.groupname);
setUserData({
name: userData["groupname"],
id: userData["orcid"],
email: userData?.emails[0]?.email,
role: userData["own-role"],
groupname: userData["groupname"],
settings: userData,
});
} catch (error) {
console.error("Error fetching user settings:", error);
localStorage.removeItem(API_CONFIG.SESSION_DATA.SETTINGS);
localStorage.removeItem(API_CONFIG.SESSION_DATA.COOKIE);
removeCookie("session", { path: "/" });
}
}
})();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

return (
<Box
Expand Down Expand Up @@ -133,8 +143,22 @@ function MainContent() {
<Route path="/register" element={<Register />} />
<Route path="/forgot" element={<ForgotPassword />} />
<Route path="/reset" element={<ResetPassword />} />
<Route path="/organizations/:title" element={<PageContainer><SingleOrganization /></PageContainer>} />
<Route path="/organizations/:title/curie-editor" element={<PageContainer><OrganizationsCurieEditor /></PageContainer>} />
<Route
path="/organizations/:title"
element={
<PageContainer>
<SingleOrganization />
</PageContainer>
}
/>
<Route
path="/organizations/:title/curie-editor"
element={
<PageContainer>
<OrganizationsCurieEditor />
</PageContainer>
}
/>
</Routes>
</Layout>
</Box>
Expand All @@ -149,13 +173,15 @@ const Layout = ({ children }) => {
useEffect(() => {
const params = new URLSearchParams(location.search);
const code = params.get("code");
if (code) {(async () => {
try {
const response = await handleOrcidLogin(code);
localStorage.setItem("token", response.token);
} catch (error) {
console.log("error: ", error)
}})();
if (code) {
(async () => {
try {
const response = await handleOrcidLogin(code);
localStorage.setItem("token", response.token);
} catch (error) {
console.log("error: ", error);
}
})();
}
}, [location]);

Expand All @@ -177,7 +203,6 @@ const Layout = ({ children }) => {
};

function App() {

return (
<ThemeProvider theme={theme}>
<CssBaseline />
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ const Header = () => {
</ListItem>
</List>
</Popover>
<a href="/" style={{ cursor: 'pointer' }}>
<a onClick={() => navigate("/")} style={{ cursor: 'pointer' }}>
<img src={Logo} alt="Interlex" />
</a>
</Box>
Expand Down