Skip to content

history alignment #10

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

Closed
FireByteApplications wants to merge 2 commits into from
Closed

history alignment #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cfae89
Develop (#7)
FireByteApplications Sep 17, 2025
9f540b4
Package and react updates (#8)
FireByteApplications Dec 6, 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
2,841 changes: 2,548 additions & 293 deletions api/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 22 additions & 10 deletions api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,33 @@
"start": "node dist/index.js"
},
"dependencies": {
"@azure/cosmos": "^4.4.1",
"@aws-sdk/credential-providers": "^3.914.0",
"@aws/lambda-invoke-store": "^0.1.0",
"@azure/core-lro": "^3.3.1",
"@azure/cosmos": "^4.6.0",
"@fast-csv/format": "^5.0.5",
"@fast-csv/parse": "^5.0.5",
"@jridgewell/trace-mapping": "^0.3.31",
"@mongodb-js/zstd": "^2.0.1",
"@swc/core": "^1.13.5",
"@swc/wasm": "^1.13.20",
"connect-mongo": "^5.1.0",
"cors": "^2.8.5",
"escape-string-regexp": "^5.0.0",
"exceljs": "^4.4.0",
"express": "^5.1.0",
"express-jwt": "^8.5.1",
"express-rate-limit": "^8.0.1",
"express-session": "^1.18.1",
"express-rate-limit": "^8.1.0",
"express-session": "^1.18.2",
"helmet": "^8.1.0",
"jsonwebtoken": "^9.0.2",
"jwks-rsa": "^3.2.0",
"kerberos": "^2.2.2",
"moment": "^2.30.1",
"moment-timezone": "^0.6.0",
"mongodb": "^6.17.0",
"mongodb": "^6.20.0",
"mongodb-client-encryption": "^6.5.0",
"snappy": "^7.3.3",
"util": "^0.12.5",
"validator": "^13.15.15"
},
Expand All @@ -31,14 +43,14 @@
"@types/express": "^5.0.3",
"@types/express-session": "^1.18.2",
"@types/jsonwebtoken": "^9.0.10",
"@types/node": "^24.0.2",
"@types/node-fetch": "^2.6.12",
"@types/validator": "^13.15.2",
"axios": "^1.10.0",
"dotenv": "^17.2.1",
"@types/node": "^24.9.1",
"@types/node-fetch": "^2.6.13",
"@types/validator": "^13.15.3",
"axios": "^1.12.2",
"dotenv": "^17.2.3",
"node-fetch": "^3.3.2",
"ts-node": "^10.9.2",
"ts-node-dev": "^2.0.0",
"typescript": "^5.8.3"
"typescript": "^5.9.3"
}
}
128 changes: 83 additions & 45 deletions api/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ import { authLimiter, attendanceLimiter, adminLimiter } from './middleware/rateL
import MongoStore from 'connect-mongo';
import { sanitizeReportingRunInput, sanitizeReportingExportInput, sanitizeAttendanceInput, sanitizeUpdatedUser, sanitizeUser } from './middleware/sanitiseInputs'
import { errorHandler } from './middleware/errorHandle'
import fs from 'fs';
import https from 'https';
import path from 'node:path';

dotenv.config();

const app = express();
Expand Down Expand Up @@ -199,7 +195,6 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
/* regenerate session ID */
await promisify(req.session.regenerate.bind(req.session))();

/* store user data on the fresh session */
req.session.user = {
email: profile.mail ?? profile.userPrincipalName,
name: profile.displayName,
Expand All @@ -208,7 +203,7 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
};
req.session.cookie.maxAge = 60 * 60 * 1000; // 1 hour

/* 5. persist & redirect */
/* persist & redirect */
await promisify(req.session.save.bind(req.session))();

const url = new URL(`${FRONTEND_URL}`);
Expand Down Expand Up @@ -269,15 +264,12 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(

const LogOut: RequestHandler = (req, res) => {
req.session.destroy(() => {
res.clearCookie('connect.sid'); // The session cookie, if using express-session
res.clearCookie('connect.sid');

// Optionally, also log out from Microsoft
// Construct a post_logout_redirect_uri to send the user back to your frontend
const postLogoutRedirect = encodeURIComponent(process.env.POST_LOGOUT_URL!);
const logoutUrl =
`https://login.microsoftonline.com/${process.env.AZURE_TENANT_ID}/oauth2/v2.0/logout?post_logout_redirect_uri=${postLogoutRedirect}`;

// Redirect user to Microsoft logout (logs them out of Azure, then returns to your site)
res.redirect(logoutUrl);
});
};
Expand Down Expand Up @@ -420,7 +412,6 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
}

if (userOk && !recordOk) {
// <-- your requested case: user updated, no records found
return res.status(200).json({
success: true,
message: "User updated. No records found to update.",
Expand All @@ -430,7 +421,6 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
}

if (!userOk && recordOk) {
// You can choose 200 (partial success) or 404 (user not found). 200 is friendlier.
return res.status(200).json({
success: true,
partial: true,
Expand All @@ -440,7 +430,6 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
});
}

// Neither update happened
return res.status(404).json({
success: false,
message: "No user or records found to update.",
Expand All @@ -465,12 +454,9 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
name,
activity,
operational,
deploymentType,
deploymentLocation,
baType,
chainsawType
detailed,
includeZeroAttendance
} = req.body;

try {
const MAX_SPAN = 365 * 24 * 60 * 60 * 1000; // 1 year ms
if (endEpoch - startEpoch > MAX_SPAN) {
Expand All @@ -481,33 +467,84 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
const query: any = {
epochTimestamp: { $gte: startEpoch, $lte: endEpoch },
};

if (name) query.name = name;
if (activity) query.activity = activity;
if (operational) query.operational = operational;

if (activity === "Deployment") {
if (deploymentType) query.deploymentType = deploymentType;
if (deploymentLocation) query.deploymentLocation = deploymentLocation;
}

if (activity === "BA-Checks" && baType) {
query.baType = baType;
}

if(activity == "Chainsaw-Checks" && chainsawType){
query.chainsawType = chainsawType;
const MAX_ROWS = 50000;
const recordsCursor = recordsCollection.find(query).limit(MAX_ROWS + 1);
const records = await recordsCursor.toArray();
if (records.length > MAX_ROWS) {
res
.status(413)
.json({ error: 'Result too large. Narrow date range or filters.' });
return;
}

const result = await recordsCollection.find(query).toArray();

const transformed = result.map(record => ({
if(detailed === true){
const transformed = records.map(record => ({
...record,
timestampLocal: moment.tz(record.epochTimestamp, 'Australia/Sydney').format('YYYY-MM-DD HH:mm')
timestampLocal: moment.tz(record.epochTimestamp, 'Australia/Sydney').format('DD-MM-YYYY HH:mm')
}));

res.status(200).json({ count: transformed.length, records: transformed });
return;
} else {
const userDataMap = new Map<string, any>();
const usersWithRecords = new Set<string>();
for (const record of records) {
const userName = record.name;
usersWithRecords.add(userName);
if (!userDataMap.has(userName)) {
const userDetails = await usersCollection.findOne({ name: userName });
if (userDetails) {
userDataMap.set(userName, {
name: userName,
memberNumber: userDetails.id || '',
status: userDetails.member_status,
membership_classification: userDetails.membership_classification,
membership_type: userDetails.membership_type,
operationalActivities: 0,
nonOperationalActivities: 0,
records: []
});
}
}
const userStats = userDataMap.get(userName);
if (userStats) {
userStats.records.push({
operational: record.operational,
activity: record.activity,
});
if (record.operational === "Operational") userStats.operationalActivities++;
else if (record.operational === "Non-Operational") userStats.nonOperationalActivities++;
}
if (includeZeroAttendance) {
const allUsers = await usersCollection.find({}).toArray();
for (const user of allUsers) {
if (!usersWithRecords.has(user.name)) {
userDataMap.set(user.name, {
name: user.name,
memberNumber: user.id || '',
status: user.member_status,
membership_classification: user.membership_classification,
membership_type: user.membership_type,
operationalActivities: 0,
nonOperationalActivities: 0,
records: []
});
}
}
}
}
const dto = [...userDataMap].map(([user, v]) => ({
user,
memberNumber: v.memberNumber,
status: v.status,
membership_classification: v.membership_classification,
membership_type: v.membership_type,
operationalActivities: v.operationalActivities,
nonOperationalActivities: v.nonOperationalActivities,
}));
res.status(200).json(dto)
}
} catch (error) {
console.error('Unable to fetch records', (error as Error).message);
res.status(500).json({ message: "Unable to fetch records" });
Expand Down Expand Up @@ -575,7 +612,7 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
const userStats = userDataMap.get(userName);
if (userStats) {
userStats.records.push({
timestampLocal: moment.tz(record.epochTimestamp, 'Australia/Sydney').format('YYYY-MM-DD HH:mm'),
timestampLocal: moment.tz(record.epochTimestamp, 'Australia/Sydney').format('DD-MM-YYYY HH:mm'),
operational: record.operational,
activity: record.activity,
...(record.baType && { baType: record.baType }),
Expand Down Expand Up @@ -607,7 +644,7 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
const userStats = userDataMap.get(userName);
if (userStats) {
userStats.records.push({
timestampLocal: moment.tz(record.epochTimestamp, 'Australia/Sydney').format('YYYY-MM-DD HH:mm'),
timestampLocal: moment.tz(record.epochTimestamp, 'Australia/Sydney').format('DD-MM-YYYY HH:mm'),
operational: record.operational,
activity: record.activity,
...(record.baType && { baType: record.baType }),
Expand All @@ -619,7 +656,7 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
}
}
}
if (includeZeroAttendance) {
if (detailed === false && includeZeroAttendance) {
const allUsers = await usersCollection.find({}).toArray();
for (const user of allUsers) {
if (!usersWithRecords.has(user.name)) {
Expand Down Expand Up @@ -651,16 +688,16 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
worksheet.addRow(header);
} else if(detailed === true){
const header = [
'Timestamp',
'Name',
'Member number',
'Status',
'Membership Classification',
'membership_type',
'Membership type',
'Operational',
'Activity',
'Activity Detail',
'Activity Location',
'timestamp'
];
worksheet.addRow(header);
}
Expand Down Expand Up @@ -693,6 +730,7 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
activityLocation = record.deploymentLocation || "";
}
const row = [
record.timestampLocal,
user.name,
user.memberNumber,
user.status,
Expand All @@ -701,8 +739,7 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
record.operational,
record.activity,
activityType,
activityLocation,
record.timestampLocal
activityLocation
];
worksheet.addRow(row);
}
Expand Down Expand Up @@ -761,7 +798,7 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
};
app.get('/api/attendance/checkUser', CheckUsername)

// Session validation based on sanitized username

const submitAttendance: RequestHandler = async (req, res) => {

const spaceName = (req.body.name as string).trim();
Expand Down Expand Up @@ -829,6 +866,7 @@ const tokenData = await fetchOrThrow<AzureTokenResponse>(
};
app.get('/api/attendance/usernameList', listNames)


app.use(errorHandler);

app.listen(port, () => {
Expand Down
10 changes: 7 additions & 3 deletions api/src/middleware/sanitiseInputs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ export function sanitizeUpdatedUser(req: Request, res: Response, next: NextFunct
};

const validators = [
{ value: sanitized.oldname, pattern: /^[a-zA-Z-\s-]+$/, field: 'Old Name' },
{ value: sanitized.name, pattern: /^[a-zA-Z-\s-]+$/, field: 'Name' },
{ value: sanitized.oldname, pattern: /^[a-zA-Z-\s]+$/, field: 'Old Name' },
{ value: sanitized.name, pattern: /^[a-zA-Z-\s]+$/, field: 'Name' },
{ value: sanitized.oldfzNumber, pattern: /^\d{1,9}?$/, field: 'Old Firezone Number' },
{ value: sanitized.fzNumber, pattern: /^\d{1,9}?$/, field: 'FireZone Number' },
{ value: sanitized.memberStatus, pattern: /^[a-zA-Z]+\(?[a-zA-Z]+\)?$/, field: 'Membership Status' },
Expand Down Expand Up @@ -130,7 +130,9 @@ export function sanitizeReportingRunInput(req: Request, res: Response, next: Nex
endEpoch,
name,
activity,
operational
operational,
detailed,
includeZeroAttendance
} = req.body ?? {};

const asTrimmedString = (v: unknown) => validator.trim(String(v ?? ''));
Expand All @@ -139,6 +141,8 @@ export function sanitizeReportingRunInput(req: Request, res: Response, next: Nex
name: asTrimmedString(name),
operational: asTrimmedString(operational),
activity: asTrimmedString(activity),
detailed: parseBoolean(detailed),
includeZeroAttendance: parseBoolean(includeZeroAttendance)
};

const validators = [
Expand Down
Loading