Grant or Revoke Admin Permissions
diff --git a/client/src/components/TdmCalculationContainer.js b/client/src/components/TdmCalculationContainer.js
index 64c3acc3..0c680e2d 100644
--- a/client/src/components/TdmCalculationContainer.js
+++ b/client/src/components/TdmCalculationContainer.js
@@ -61,14 +61,16 @@ export function TdmCalculationContainer({
setLoggedInAccount,
contentContainerRef,
checklistModalOpen,
- toggleChecklistModal
+ toggleChecklistModal,
+ rules,
+ setRules,
+ dateModified,
+ setDateModified
}) {
const [engine, setEngine] = useState(null);
- const [rules, setRules] = useState([]);
const [formInputs, setFormInputs] = useState({});
const [projectId, setProjectId] = useState(null);
const [loginId, setLoginId] = useState(0);
- const [dateModified, setDateModified] = useState(null);
const [view, setView] = useState("w");
const [strategiesInitialized, setStrategiesInitialized] = useState(false);
const [formHasSaved, setFormHasSaved] = useState(true);
@@ -137,7 +139,15 @@ export function TdmCalculationContainer({
}
};
initiateEngine();
- }, [match.params.projectId, engine, account, history, triggerInitiateEngine]);
+ }, [
+ match.params.projectId,
+ engine,
+ account,
+ history,
+ triggerInitiateEngine,
+ setRules,
+ setDateModified
+ ]);
const closeStrategiesModal = () => {
setInapplicableStrategiesModal(!inapplicableStrategiesModal);
@@ -645,7 +655,11 @@ TdmCalculationContainer.propTypes = {
setLoggedInAccount: PropTypes.func,
contentContainerRef: PropTypes.object,
checklistModalOpen: PropTypes.bool,
- toggleChecklistModal: PropTypes.func
+ toggleChecklistModal: PropTypes.func,
+ rules: PropTypes.array,
+ setRules: PropTypes.func,
+ dateModified: PropTypes.string || null,
+ setDateModified: PropTypes.func
};
export default withRouter(injectSheet(styles)(TdmCalculationContainer));
diff --git a/client/src/components/ToolTip/ToolTipLabel.js b/client/src/components/ToolTip/ToolTipLabel.js
index 6172d09c..413e4a02 100644
--- a/client/src/components/ToolTip/ToolTipLabel.js
+++ b/client/src/components/ToolTip/ToolTipLabel.js
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
import { createUseStyles } from "react-jss";
import clsx from "clsx";
-const useStyles = createUseStyles({
+const useStyles = createUseStyles(theme => ({
tooltipLabel: {
flexGrow: "1",
flexShrink: "1",
@@ -38,10 +38,10 @@ const useStyles = createUseStyles({
requiredInputLabel: {
"&:after": {
content: '" *"',
- color: "red"
+ color: theme.colors.warning
}
}
-});
+}));
const ToolTipLabel = ({
id,
diff --git a/client/src/services/account.service.js b/client/src/services/account.service.js
index f02b1f1a..e6ee5e1b 100644
--- a/client/src/services/account.service.js
+++ b/client/src/services/account.service.js
@@ -5,7 +5,7 @@ const baseUrl = "/api/accounts";
export const search = async () => {
try {
const response = await axios.get(`${baseUrl}`);
- return response.data;
+ return response;
} catch (err) {
throw Error("Search accounts failed");
}
@@ -31,6 +31,16 @@ export const register = async (firstName, lastName, email, password) => {
}
};
+export const updateAccount = async (id, firstName, lastName, email) => {
+ try {
+ const body = { id, firstName, lastName, email };
+ const response = await axios.put(`${baseUrl}/${id}/updateaccount`, body);
+ return response.data;
+ } catch (err) {
+ throw Error("Update account failed");
+ }
+};
+
export const resendConfirmationEmail = async email => {
const body = { email };
try {
diff --git a/client/src/styles/theme.js b/client/src/styles/theme.js
index 20ae7739..7850b517 100644
--- a/client/src/styles/theme.js
+++ b/client/src/styles/theme.js
@@ -94,6 +94,10 @@ module.exports = {
textAlign: "center",
color: "#000000"
}
+ },
+ border: {
+ dashedWarning: "1px dashed #B64E38",
+ solidWarning: "1px solid #B64E38"
}
}
};
diff --git a/package-lock.json b/package-lock.json
index e34a72fd..b6f2904e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "root",
- "version": "0.2.42",
+ "version": "0.2.45",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "root",
- "version": "0.2.42",
+ "version": "0.2.45",
"dependencies": {
"wait-on": "^6.0.1"
},
diff --git a/package.json b/package.json
index 999786fb..c1db00c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "root",
- "version": "0.2.46",
+ "version": "0.2.47",
"private": true,
"scripts": {
"release-notes": "gren release --override",
diff --git a/server/app/controllers/account.controller.js b/server/app/controllers/account.controller.js
index 9a223667..d3550706 100644
--- a/server/app/controllers/account.controller.js
+++ b/server/app/controllers/account.controller.js
@@ -5,6 +5,7 @@ const {
} = require("../../middleware/validate");
const accountSchema = require("../schemas/account");
const accountRegisterSchema = require("../schemas/account.register");
+const accountUpdateAccountSchema = require("../schemas/account.updateAccount");
const accountConfirmRegisterSchema = require("../schemas/account.confirmRegister");
const accountLoginSchema = require("../schemas/account.login");
const accountForgotSchema = require("../schemas/account.forgotPassword");
@@ -50,6 +51,15 @@ const register = async (req, res) => {
}
};
+const updateAccount = async (req, res) => {
+ try {
+ const response = await accountService.updateAccount(req.body);
+ res.send(response);
+ } catch (err) {
+ res.status(err.code || "500").json({ error: err.toString() });
+ }
+};
+
const resendConfirmationEmail = async (req, res) => {
try {
const response = await accountService.resendConfirmationEmail(
@@ -144,6 +154,11 @@ module.exports = {
register,
validationErrorMiddleware
],
+ updateAccount: [
+ validate({ body: accountUpdateAccountSchema }),
+ updateAccount,
+ validationErrorMiddleware
+ ],
confirmRegister: [
validate({ body: accountConfirmRegisterSchema }),
confirmRegister,
diff --git a/server/app/routes/account.routes.js b/server/app/routes/account.routes.js
index ba2086b4..db9a73e3 100644
--- a/server/app/routes/account.routes.js
+++ b/server/app/routes/account.routes.js
@@ -3,9 +3,17 @@ const accountController = require("../controllers/account.controller");
const jwtSession = require("../../middleware/jwt-session");
router.get("/:id", jwtSession.validateUser, accountController.getById);
-router.get("/", jwtSession.validateUser, accountController.getAll);
+router.get(
+ "/",
+ jwtSession.validateRoles(["isSecurityAdmin"]),
+ accountController.getAll
+);
-router.put("/:id/roles", accountController.putRoles);
+router.put(
+ "/:id/roles",
+ jwtSession.validateRoles(["isSecurityAdmin"]),
+ accountController.putRoles
+);
router.post("/register", accountController.register);
router.post(
diff --git a/server/app/routes/calculation.routes.js b/server/app/routes/calculation.routes.js
index c3da85bf..2ec9f6f1 100644
--- a/server/app/routes/calculation.routes.js
+++ b/server/app/routes/calculation.routes.js
@@ -2,6 +2,7 @@ const router = require("express").Router();
const calculationController = require("../controllers/calculation.controller");
const ruleController = require("../controllers/rule.controller");
+const jwtSession = require("../../middleware/jwt-session");
module.exports = router;
@@ -9,6 +10,18 @@ router.get("/:id", calculationController.getById);
// Get all the rules for a calculation
router.get("/:id/rules", ruleController.getByCalculationId);
router.get("/", calculationController.getAll);
-router.post("/", calculationController.post);
-router.put("/:id", calculationController.put);
-router.delete("/:id", calculationController.del);
+router.post(
+ "/",
+ jwtSession.validateRoles(["isAdmin"]),
+ calculationController.post
+);
+router.put(
+ "/:id",
+ jwtSession.validateRoles(["isAdmin"]),
+ calculationController.put
+);
+router.delete(
+ "/:id",
+ jwtSession.validateRoles(["isAdmin"]),
+ calculationController.del
+);
diff --git a/server/app/routes/faq.routes.js b/server/app/routes/faq.routes.js
index 50dabd40..c091414f 100644
--- a/server/app/routes/faq.routes.js
+++ b/server/app/routes/faq.routes.js
@@ -1,4 +1,5 @@
const router = require("express").Router();
+const jwtSession = require("../../middleware/jwt-session");
const faqController = require("../controllers/faq.controller");
@@ -6,6 +7,6 @@ module.exports = router;
router.get("/", faqController.get);
router.get("/:id", faqController.getById);
-router.post("/", faqController.post);
-router.put("/:id", faqController.put);
-router.delete("/:id", faqController.del);
+router.post("/", jwtSession.validateRoles(["isAdmin"]), faqController.post);
+router.put("/:id", jwtSession.validateRoles(["isAdmin"]), faqController.put);
+router.delete("/:id", jwtSession.validateRoles(["isAdmin"]), faqController.del);
diff --git a/server/app/routes/faqCategory.routes.js b/server/app/routes/faqCategory.routes.js
index 48ce67ed..9d86b991 100644
--- a/server/app/routes/faqCategory.routes.js
+++ b/server/app/routes/faqCategory.routes.js
@@ -1,4 +1,5 @@
const router = require("express").Router();
+const jwtSession = require("../../middleware/jwt-session");
const faqCategoryController = require("../controllers/faqCategory.controller");
@@ -6,6 +7,18 @@ module.exports = router;
router.get("/", faqCategoryController.get);
router.get("/:id", faqCategoryController.getById);
-router.post("/", faqCategoryController.post);
-router.put("/:id", faqCategoryController.put);
-router.delete("/:id", faqCategoryController.del);
+router.post(
+ "/",
+ jwtSession.validateRoles(["isAdmin"]),
+ faqCategoryController.post
+);
+router.put(
+ "/:id",
+ jwtSession.validateRoles(["isAdmin"]),
+ faqCategoryController.put
+);
+router.delete(
+ "/:id",
+ jwtSession.validateRoles(["isAdmin"]),
+ faqCategoryController.del
+);
diff --git a/server/app/routes/rule.routes.js b/server/app/routes/rule.routes.js
index beac4648..7e06fc44 100644
--- a/server/app/routes/rule.routes.js
+++ b/server/app/routes/rule.routes.js
@@ -1,11 +1,12 @@
const router = require("express").Router();
const ruleController = require("../controllers/rule.controller");
+const jwtSession = require("../../middleware/jwt-session");
module.exports = router;
router.get("/:id", ruleController.getById);
router.get("/", ruleController.getAll);
-router.post("/", ruleController.post);
-router.put("/:id", ruleController.put);
-router.delete("/", ruleController.del);
+router.post("/", jwtSession.validateRoles(["isAdmin"]), ruleController.post);
+router.put("/:id", jwtSession.validateRoles(["isAdmin"]), ruleController.put);
+router.delete("/", jwtSession.validateRoles(["isAdmin"]), ruleController.del);
diff --git a/server/app/schemas/account.role.js b/server/app/schemas/account.role.js
index df764d82..c95c3a81 100644
--- a/server/app/schemas/account.role.js
+++ b/server/app/schemas/account.role.js
@@ -6,10 +6,10 @@ module.exports = {
type: "number"
},
isAdmin: {
- type: "number"
+ type: "boolean"
},
isSecurityAdmin: {
- type: "number"
+ type: "boolean"
}
}
};
diff --git a/server/app/schemas/account.updateAccount.js b/server/app/schemas/account.updateAccount.js
new file mode 100644
index 00000000..7b63c796
--- /dev/null
+++ b/server/app/schemas/account.updateAccount.js
@@ -0,0 +1,17 @@
+module.exports = {
+ type: "object",
+ required: ["firstName", "lastName", "email"],
+ properties: {
+ firstName: {
+ type: "string",
+ minLength: 1
+ },
+ lastName: {
+ type: "string",
+ minLength: 1
+ },
+ email: {
+ type: "string"
+ }
+ }
+};
diff --git a/server/app/services/account.service.js b/server/app/services/account.service.js
index 9cbe5584..2ffa1a60 100644
--- a/server/app/services/account.service.js
+++ b/server/app/services/account.service.js
@@ -4,6 +4,7 @@ const { promisify } = require("util");
const moment = require("moment");
const bcrypt = require("bcrypt");
const {
+ sendVerifyUpdateConfirmation,
sendRegistrationConfirmation,
sendResetPasswordConfirmation
} = require("./sendgrid-service");
@@ -87,6 +88,31 @@ const register = async model => {
}
};
+const updateAccount = async model => {
+ const token = uuid4();
+ try {
+ await poolConnect;
+ const request = pool.request();
+ request.input("id", mssql.Int, model.id);
+ request.input("FirstName", mssql.NVarChar, model.firstName);
+ request.input("LastName", mssql.NVarChar, model.lastName);
+ request.input("Email", mssql.NVarChar, model.email);
+ await request.execute("Login_Update");
+ await sendVerifyUpdateConfirmation(model.email, token);
+ return {
+ isSuccess: true,
+ code: "ACCOUNT_UPDATE_SUCCESS",
+ message: "Account Updates."
+ };
+ } catch (err) {
+ return {
+ isSuccess: false,
+ code: "ACCOUNT_UPDATE_SUCCESS",
+ message: `Account updates failed. ${err.message}`
+ };
+ }
+};
+
// Re-transmit confirmation email
const resendConfirmationEmail = async email => {
let result = null;
@@ -341,21 +367,6 @@ const authenticate = async (email, password) => {
};
};
-// Not fully implemented - needs sproc
-const update = async model => {
- try {
- await poolConnect;
- const request = pool.request();
- request.input("id", mssql.Int, model.id);
- request.input("firstName", mssql.NVarChar, model.firstName);
- request.input("lastName", mssql.NVarChar, model.lastName);
- request.input("email", mssql.NVarChar, model.email);
- await request.execute("Login_Update");
- } catch (err) {
- return Promise.reject(err);
- }
-};
-
const updateRoles = async model => {
try {
await poolConnect;
@@ -403,12 +414,12 @@ module.exports = {
selectAll,
selectById,
register,
+ updateAccount,
confirmRegistration,
resendConfirmationEmail,
forgotPassword,
resetPassword,
authenticate,
- update,
updateRoles,
del
};
diff --git a/server/app/services/sendgrid-service.js b/server/app/services/sendgrid-service.js
index ddef914b..ba683c85 100644
--- a/server/app/services/sendgrid-service.js
+++ b/server/app/services/sendgrid-service.js
@@ -18,6 +18,21 @@ const send = async (emailTo, emailFrom, subject, textBody, htmlBody) => {
return sgMail.send(msg, false);
};
+const sendVerifyUpdateConfirmation = async (email, token) => {
+ const msg = {
+ to: `${email}`,
+ from: senderEmail,
+ subject: "Verify Your Account Updates",
+ text: "Verify Your Account Updates",
+ html: `
Hello, your account has been updated.
+
If you did not update your account please notify ladot@lacity.org.
+
Verify Account Updates
+
Thanks,
+
TDM Calculator Team
`
+ };
+ return sgMail.send(msg, false);
+};
+
const sendRegistrationConfirmation = async (email, token) => {
const msg = {
to: `${email}`,
@@ -25,9 +40,8 @@ const sendRegistrationConfirmation = async (email, token) => {
subject: "Verify Your Account",
text: "Verify your account",
html: `
Hello, please click the following link to verify your account.
-
Verify Me
-
+
If you did not create a new account or update your account please notify ladot@lacity.org.
Thanks,
TDM Calculator Team
`
};
@@ -75,6 +89,7 @@ const sendPublicComment = async publicCommentData => {
module.exports = {
send,
+ sendVerifyUpdateConfirmation,
sendRegistrationConfirmation,
sendResetPasswordConfirmation,
sendPublicComment
diff --git a/server/db/migration/V20230420.1255__create_sproc_update_account_780.sql b/server/db/migration/V20230420.1255__create_sproc_update_account_780.sql
new file mode 100644
index 00000000..0e209c62
--- /dev/null
+++ b/server/db/migration/V20230420.1255__create_sproc_update_account_780.sql
@@ -0,0 +1,27 @@
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE OR ALTER PROC [dbo].[Login_Update]
+ @id int
+ ,
+ @firstName nvarchar(50)
+ ,
+ @lastName nvarchar(50)
+ ,
+ @email nvarchar(100)
+AS
+BEGIN
+
+ UPDATE Login SET
+ firstName = @firstName
+ ,
+ lastName = @lastName
+ ,
+ email = @email
+ ,
+ emailConfirmed = 0
+ WHERE
+ id = @id
+END
+GO
\ No newline at end of file
diff --git a/server/middleware/jwt-session.js b/server/middleware/jwt-session.js
index a64d5788..59e2c689 100644
--- a/server/middleware/jwt-session.js
+++ b/server/middleware/jwt-session.js
@@ -4,11 +4,6 @@ const jwtSecret = process.env.JWT_SECRET || "mark it zero";
// JWT timeout set to 12 hours
const jwtOpts = { algorithm: "HS256", expiresIn: "12h" };
-module.exports = {
- login,
- validateUser
-};
-
// This module manages the user's session using a JSON Web Token in the
// "authorization" cookie to manage the session.
@@ -19,7 +14,12 @@ module.exports = {
// as as a JSON response body (for clients that may not be able to
// work with cookies).
async function login(req, res) {
- const token = await sign({ email: req.user.email, id: req.user.id });
+ const token = await sign({
+ email: req.user.email,
+ id: req.user.id,
+ isAdmin: req.user.isAdmin,
+ isSecurityAdmin: req.user.isSecurityAdmin
+ });
res.cookie("jwt", token, {
httpOnly: true,
expires: new Date(Date.now() + 43200000) // 12 hours
@@ -41,10 +41,43 @@ async function validateUser(req, res, next) {
return next();
}
} catch (er) {
- res.status("401").send("Login session expired");
+ res.status("401").send("Unauthenticated User");
}
}
+// When a request is received for a route that requires an
+// authenticated user, this middleware function validates that
+// the authorization cookie has a valid JWT and that the
+// user is grantee one of the roles listed in authorizedRoles,
+// e.g., from the account.routes router:
+// router.put(
+// "/:id/roles",
+// jwtSession.authorizeUser(["isSecurityAdmin"]),
+// accountController.putRoles
+// );
+const validateRoles = authorizedRoles =>
+ async function validateUser(req, res, next) {
+ const jwtString = req.headers.authorization || req.cookies.jwt;
+ try {
+ const payload = await verify(jwtString);
+
+ if (payload.email) {
+ req.user = payload;
+ if (authorizedRoles.includes("isAdmin") && payload.isAdmin) {
+ return next();
+ } else if (
+ authorizedRoles.includes("isSecurityAdmin") &&
+ payload.isSecurityAdmin
+ ) {
+ return next();
+ }
+ res.status("403").send("Unauthorized request");
+ }
+ } catch (er) {
+ res.status("401").send("Unauthenticated User");
+ }
+ };
+
// Helper function to create JWT token
async function sign(payload) {
const token = await jwt.sign(payload, jwtSecret, jwtOpts);
@@ -56,3 +89,9 @@ async function verify(jwtString = "") {
jwtString = jwtString.replace(/^Bearer /i, "");
return jwt.verify(jwtString, jwtSecret);
}
+
+module.exports = {
+ login,
+ validateUser,
+ validateRoles
+};
diff --git a/server/package.json b/server/package.json
index db2398f7..51e80db9 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
{
"name": "tdm-calculator-api",
- "version": "0.2.46",
+ "version": "0.2.47",
"description": "Traffic Data Management Calculator",
"repository": {
"type": "git",