Skip to content

Commit 6cad68e

Browse files
committed
longer auth
1 parent 67e389d commit 6cad68e

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/backend/src/controllers/users.controllers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export default class UsersController {
102102

103103
const { user, token } = await UsersService.logUserIn(idToken, header!);
104104

105-
res.cookie('token', token, { httpOnly: true, sameSite: 'none', secure: true });
105+
res.cookie('token', token, { httpOnly: true, sameSite: 'none', secure: true, maxAge: 7 * 24 * 60 * 60 * 1000 });
106106
res.status(200).json(user);
107107
} catch (error: unknown) {
108108
next(error);

src/backend/src/utils/auth.utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const TOKEN_SECRET = process.env.TOKEN_SECRET || 'i<3security';
1111

1212
// generate a jwt using the user's first and last name
1313
export const generateAccessToken = (user: { userId: string; firstName: string; lastName: string }) => {
14-
return jwt.sign(user, TOKEN_SECRET, { expiresIn: '12h' });
14+
return jwt.sign(user, TOKEN_SECRET, { expiresIn: '7d' });
1515
};
1616

1717
// headers needed for production

src/frontend/src/pages/CreateChangeRequestPage/CreateChangeRequest.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const CreateChangeRequest: React.FC<CreateChangeRequestProps> = () => {
115115
toast.error(e.message);
116116
}
117117
} finally {
118-
if (requestHasASolution) history.push(routes.CHANGE_REQUESTS);
118+
if (requestHasASolution) history.push(`${routes.PROJECTS}/${wbsNum}/change-requests`);
119119
}
120120
};
121121

src/frontend/src/pages/WorkPackageDetailPage/ActivateWorkPackageModalContainer/ActivateWorkPackageModalContainer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { useHistory } from 'react-router-dom';
7-
import { ChangeRequestType, dateToMidnightUTC, WbsNumber } from 'shared';
7+
import { ChangeRequestType, dateToMidnightUTC, WbsNumber, wbsPipe } from 'shared';
88
import { useAuth } from '../../../hooks/auth.hooks';
99
import { useCreateActivationChangeRequest } from '../../../hooks/change-requests.hooks';
1010
import { useAllMembers } from '../../../hooks/users.hooks';
@@ -57,7 +57,7 @@ const ActivateWorkPackageModalContainer: React.FC<ActivateWorkPackageModalContai
5757
startDate: dateToMidnightUTC(startDate).toISOString(),
5858
confirmDetails
5959
});
60-
history.push(routes.CHANGE_REQUESTS);
60+
history.push(`${routes.PROJECTS}/${wbsPipe(wbsNum)}/change-requests`);
6161
} catch (e: unknown) {
6262
if (e instanceof Error) {
6363
toast.error(e.message);

src/frontend/src/pages/WorkPackageDetailPage/StageGateWorkPackageModalContainer/StageGateWorkPackageModalContainer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { useHistory } from 'react-router-dom';
7-
import { ChangeRequestType, WbsNumber } from 'shared';
7+
import { ChangeRequestType, WbsNumber, wbsPipe } from 'shared';
88
import { useAuth } from '../../../hooks/auth.hooks';
99
import { useCreateStageGateChangeRequest } from '../../../hooks/change-requests.hooks';
1010
import { routes } from '../../../utils/routes';
@@ -45,7 +45,7 @@ const StageGateWorkPackageModalContainer: React.FC<StageGateWorkPackageModalCont
4545
type: ChangeRequestType.StageGate,
4646
confirmDone
4747
});
48-
history.push(routes.CHANGE_REQUESTS);
48+
history.push(`${routes.PROJECTS}/${wbsPipe(wbsNum)}/change-requests`);
4949
} catch (e: unknown) {
5050
if (e instanceof Error) {
5151
toast.error(e.message);

src/frontend/src/pages/WorkPackageForm/WorkPackageFormView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ const WorkPackageFormView: React.FC<WorkPackageFormViewProps> = ({
305305
proposedSolutions: []
306306
});
307307

308-
history.push(routes.CHANGE_REQUESTS);
308+
history.push(`${routes.PROJECTS}/${wbsPipe(wbsElement.wbsNum)}/change-requests`);
309309
} else {
310310
await workPackageMutateAsync(payload);
311311
exitActiveMode();

0 commit comments

Comments
 (0)