dce-expresskit 4.0.0-beta.9 → 4.0.0-log-reviewer-beta.10

package/genEncodedSecret.ts

@@ -1,107 +1,84 @@
 // Import crypto lib
 import crypto from 'crypto';
 
-// Prompt
-import readline from 'readline';
-
-// Create a readline interface
-const readlineInterface = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout
-});
-
-/**
- * Prompt user for input
- * @author Gabe Abrams
- * @param question the question to ask the user
- * @returns the text from the user
- */
-const prompt = (question: string): Promise<string> => {
-  return new Promise((resolve, reject) => {
-    readlineInterface.question(question, (answer: string) => {
-      if (!answer || answer.trim().length === 0) {
-        console.log('\nValue cannot be empty. Exiting...');
-        process.exit(0);
-      }
-
-      resolve(answer);
-    });
-  });
-};
-
-// All chars for randomizer
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
-(async () => {
-  console.log('––––– Generate Encoded Secret –––––');
-  console.log('\nFirst, we need info on the *receiving* server');
-  console.log('This is the server that hosts the cross-server endpoint, the one that receives requests from the sending server.\n');
-
-  // Get salt
-  console.log('Encoding salt on the *receiving* server')
-  const salt = await prompt('Salt: ');
-
-  // Get host
-  console.log('Hostname of the *receiving* server');
-  const host = await prompt('Host: ');
-
-  console.log('\n\nSecond, we need info on the *sending* server');
-  console.log('This is the server that sends requests to the receiving server.\n');
-
-  // Get key
-  console.log('Short unique key for the *sending* server (only letters and dashes, no whitespace)')
-  const key = (await prompt('Key: ')).trim();
-
-  // Get description
-  console.log('Human-readable description of the *sending* server')
-  const description = await prompt('Description: ');
-
+// Get args
+const DCEKIT_CRED_ENCODING_SALT = process.env.npm_config_salt;
+if (!DCEKIT_CRED_ENCODING_SALT) {
+  console.log('Encoding salt is required: --salt=...');
+  process.exit(1);
+}
+
+// Get the key
+let key = process.env.npm_config_key;
+if (!key) {
+  console.log('Key is required: --key=...');
+  process.exit(1);
+}
+
+// Get the description
+let description = process.env.npm_config_description;
+if (!description) {
+  console.log('Description is required: --description=...');
+  process.exit(1);
+}
+
+// Get secret
+let secret = process.env.npm_config_secret;
+if (!secret) {
   // Generate a random secret
-  let secret = '';
+  secret = '';
   for (let i = 0; i < 32; i++) {
     secret += chars.charAt(Math.floor(Math.random() * chars.length));
   }
-  secret = Buffer.from(secret).toString('base64');
-
-  // Encryption process based on:
-  // https://medium.com/@tony.infisical/guide-to-nodes-crypto-module-for-encryption-decryption-65c077176980
-
-  // Create a random initialization vector
-  const iv = crypto.randomBytes(12).toString('base64');
-
-  // Create a cipher
-  console.log('salt', salt, Buffer.from(salt, 'base64'));
-  const cipher = crypto.createCipheriv(
-    'aes-256-gcm',
-    Buffer.from(salt, 'base64'),
-    Buffer.from(iv, 'base64'),
-  );
-
-  // Encrypt the string
-  let ciphertext = cipher.update(secret, 'utf8', 'base64');
-
-  // Finalize the encryption
-  ciphertext += cipher.final('base64');
-
-  // Get the authentication tag
-  const tag = cipher.getAuthTag();
-
-  // JSONify the encrypted data
-  const encryptionPack = encodeURIComponent(JSON.stringify({
-    ciphertext,
-    iv,
-    tag,
-  }));
-
-  // Show the encrypted data
-  console.log('\n\n');
-  console.log('––––– Done! What\'s Next: –––––');
-  console.log('');
-  console.log('On the *sending* server, !!APPEND!! the following to the DCEKIT_CROSS_SERVER_CREDENTIALS env var:');
-  console.log(`|${host}:${key}:${secret}|`);
-  console.log('');
-  console.log('On the *receiving* server, add an entry to its "CrossServerCredential" collection:');
-  console.log(`{ "description": "${description}", "key": "${key}", "encodedeSecret": "${encryptionPack}", "scopes": [] }`);
-  console.log('');
-  console.log('For all scopes that the server should have access to, add them to the "scopes" array.');
-})();
+  console.log('Generated a random secret. If you have one in mind, use --secret=...');
+}
+
+// Get the host name
+const host = process.env.npm_config_host;
+if (!host) {
+  console.log('Host of the receiving server is required: --host=...');
+  process.exit(1);
+}
+
+// Encryption process based on:
+// https://medium.com/@tony.infisical/guide-to-nodes-crypto-module-for-encryption-decryption-65c077176980
+
+// Create a random initialization vector
+const iv = crypto.randomBytes(12).toString('base64');
+
+// Create a cipher
+const cipher = crypto.createCipheriv(
+  'aes-256-gcm',
+  Buffer.from(secret, 'base64'),
+  Buffer.from(iv, 'base64'),
+);
+
+// Encrypt the string
+let ciphertext = cipher.update(secret, 'utf8', 'base64');
+
+// Finalize the encryption
+ciphertext += cipher.final('base64');
+
+// Get the authentication tag
+const tag = cipher.getAuthTag();
+
+// JSONify the encrypted data
+const encryptionPack = encodeURIComponent(JSON.stringify({
+  ciphertext,
+  iv,
+  tag,
+}));
+
+// Show the encrypted data
+console.log('\n\n');
+console.log('––––– Done! What\'s Next: –––––');
+console.log('');
+console.log('On the server *sending* the requests, append the following to the DCEKIT_CROSS_SERVER_CREDENTIALS env var:');
+console.log(`|${host}:${key}:${secret}|`);
+console.log('');
+console.log('On the server *receiving* the requests, add an entry to the "CrossServerCredential" collection:');
+console.log(`{ "description": "${description}", "key": "${key}", "encodedeSecret": "${encryptionPack}", "scopes": [] }`);
+console.log('');
+console.log('For all scopes that the server should have access to, add them to the "scopes" array.');

package/lib/constants/LOG_REVIEW_PAGE_SIZE.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Log reviewer page size
+ * @author Yuen Ler Chow
+ */
+declare const LOG_REVIEW_PAGE_SIZE = 100;
+export default LOG_REVIEW_PAGE_SIZE;

package/lib/constants/LOG_REVIEW_PAGE_SIZE.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Log reviewer page size
+ * @author Yuen Ler Chow
+ */
+var LOG_REVIEW_PAGE_SIZE = 100;
+exports.default = LOG_REVIEW_PAGE_SIZE;
+//# sourceMappingURL=LOG_REVIEW_PAGE_SIZE.js.map

package/lib/constants/LOG_REVIEW_PAGE_SIZE.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LOG_REVIEW_PAGE_SIZE.js","sourceRoot":"","sources":["../../src/constants/LOG_REVIEW_PAGE_SIZE.ts"],"names":[],"mappings":";;AAAA;;;GAGG;AACH,IAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC,kBAAe,oBAAoB,CAAC"}

package/lib/helpers/dataSigner.js

@@ -165,7 +165,7 @@ exports.signRequest = signRequest;
  * @returns parsed and validated params
  */
 var validateSignedRequest = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
-    var signature, timestamp, key, method, path, params, crossServerCredentialCollection, crossServerCredentialMatches, crossServerCredential, allowedScopes, secret, expectedSignature, elapsedMs;
+    var signature, timestamp, key, method, path, params, scope, crossServerCredentialCollection, crossServerCredentialMatches, crossServerCredential, allowedScopes, secret, paramsToSign, expectedSignature, elapsedMs;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -189,7 +189,7 @@ var validateSignedRequest = function (opts) { return __awaiter(void 0, void 0, v
                     throw new dce_reactkit_1.ErrorWithCode('Could not validate a cross-server request there was no oauth consumer key.', ExpressKitErrorCode_1.default.CrossServerMissingSignedRequestInfo);
                 }
                 key = opts.params.oauth_consumer_key;
-                method = opts.method, path = opts.path, params = opts.params;
+                method = opts.method, path = opts.path, params = opts.params, scope = opts.scope;
                 crossServerCredentialCollection = (0, initServer_1.internalGetCrossServerCredentialCollection)();
                 if (!crossServerCredentialCollection) {
                     throw new dce_reactkit_1.ErrorWithCode('Could not validate a cross-server request because the cross-server credential collection was not ready in time.', ExpressKitErrorCode_1.default.SignedRequestInvalidCollection);
@@ -202,16 +202,26 @@ var validateSignedRequest = function (opts) { return __awaiter(void 0, void 0, v
                 }
                 crossServerCredential = crossServerCredentialMatches[0];
                 allowedScopes = crossServerCredential.scopes;
-                if (!allowedScopes || !Array.isArray(allowedScopes) || !allowedScopes.includes(opts.scope)) {
+                if (!allowedScopes || !Array.isArray(allowedScopes)) {
+                    throw new dce_reactkit_1.ErrorWithCode('Could not validate a cross-server request because the credential does not have access to any scopes.', ExpressKitErrorCode_1.default.SignedRequestInvalidScope);
+                }
+                if (!allowedScopes.includes(scope)) {
                     throw new dce_reactkit_1.ErrorWithCode('Could not validate a cross-server request because the required scope was not approved for the credential.', ExpressKitErrorCode_1.default.SignedRequestInvalidScope);
                 }
                 return [4 /*yield*/, decrypt(crossServerCredential.encodedeSecret)];
             case 2:
                 secret = _a.sent();
+                paramsToSign = __assign({}, params);
+                Object.keys(paramsToSign).forEach(function (key) {
+                    // Delete oauth params
+                    if (key.startsWith('oauth_')) {
+                        delete paramsToSign[key];
+                    }
+                });
                 return [4 /*yield*/, genSignature({
                         method: method,
                         path: path,
-                        params: params,
+                        params: paramsToSign,
                         secret: secret,
                     })];
             case 3:
@@ -221,7 +231,7 @@ var validateSignedRequest = function (opts) { return __awaiter(void 0, void 0, v
                     throw new dce_reactkit_1.ErrorWithCode('Could not validate a cross-server request because the signature did not match.', ExpressKitErrorCode_1.default.SignedRequestInvalidSignature);
                 }
                 elapsedMs = Math.abs(Date.now() - timestamp);
-                if (elapsedMs < dce_reactkit_1.MINUTE_IN_MS) {
+                if (elapsedMs > dce_reactkit_1.MINUTE_IN_MS) {
                     throw new dce_reactkit_1.ErrorWithCode('Could not validate a cross-server request because the request was too old.', ExpressKitErrorCode_1.default.SignedRequestInvalidTimestamp);
                 }
                 return [2 /*return*/];

package/lib/helpers/dataSigner.js.map

@@ -1 +1 @@
-{"version":3,"file":"dataSigner.js","sourceRoot":"","sources":["../../src/helpers/dataSigner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dataSigner.js","sourceRoot":"","sources":["../../src/helpers/dataSigner.ts"],"names":[],"mappings":"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"}

package/lib/helpers/getLogReviewerLogs.d.ts

@@ -0,0 +1,27 @@
+import { Log, LogReviewerFilterState } from 'dce-reactkit';
+import { Collection } from 'dce-mango';
+/**
+ * Get logs for the log reviewer interface
+ * @author Yuen Ler Chow
+ * @param opts object containing all arguments
+ * @param opts.pageNumber the page number to retrieve (1-indexed)
+ * @param opts.filters filter criteria for logs
+ * @param opts.countDocuments if true, count number of documents matching
+ *   filters and return num pages (not always required because if changing pages,
+ *   we don't need to recount documents)
+ * @param opts.logCollection MongoDB collection containing logs
+ * @returns object with logs for the requested page and optionally total number of pages
+ */
+declare const getLogReviewerLogs: (opts: {
+    pageNumber: number;
+    filters: LogReviewerFilterState;
+    countDocuments: boolean;
+    logCollection: Collection<Log>;
+}) => Promise<import("dce-mango/lib/types/PaginatedResponse").default<Log> | {
+    numPages: number;
+    items: Log[];
+    currentPageNumber: number;
+    perPage: number;
+    hasAnotherPage: boolean;
+}>;
+export default getLogReviewerLogs;

package/lib/helpers/getLogReviewerLogs.js

@@ -0,0 +1,238 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// Import dce-reactkit
+var dce_reactkit_1 = require("dce-reactkit");
+// Import shared types
+var LOG_REVIEW_PAGE_SIZE_1 = __importDefault(require("../constants/LOG_REVIEW_PAGE_SIZE"));
+/**
+ * Get logs for the log reviewer interface
+ * @author Yuen Ler Chow
+ * @param opts object containing all arguments
+ * @param opts.pageNumber the page number to retrieve (1-indexed)
+ * @param opts.filters filter criteria for logs
+ * @param opts.countDocuments if true, count number of documents matching
+ *   filters and return num pages (not always required because if changing pages,
+ *   we don't need to recount documents)
+ * @param opts.logCollection MongoDB collection containing logs
+ * @returns object with logs for the requested page and optionally total number of pages
+ */
+var getLogReviewerLogs = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
+    var pageNumber, filters, countDocuments, logCollection, _a, dateFilterState, contextFilterState, tagFilterState, actionErrorFilterState, advancedFilterState, query, startDate, endDate, startTimestamp, endTimestamp, contextConditions, selectedTags, selectedTargets, selectedActions, roles, response, numPages, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0:
+                pageNumber = opts.pageNumber, filters = opts.filters, countDocuments = opts.countDocuments, logCollection = opts.logCollection;
+                _a = filters, dateFilterState = _a.dateFilterState, contextFilterState = _a.contextFilterState, tagFilterState = _a.tagFilterState, actionErrorFilterState = _a.actionErrorFilterState, advancedFilterState = _a.advancedFilterState;
+                query = {};
+                startDate = dateFilterState.startDate, endDate = dateFilterState.endDate;
+                startTimestamp = new Date("".concat(startDate.month, "/").concat(startDate.day, "/").concat(startDate.year)).getTime();
+                endTimestamp = ((new Date("".concat(endDate.month, "/").concat(endDate.day, "/").concat(endDate.year))).getTime()
+                    + dce_reactkit_1.DAY_IN_MS);
+                // Add a date range condition to the query
+                query.timestamp = {
+                    $gte: startTimestamp,
+                    $lt: endTimestamp,
+                };
+                contextConditions = [];
+                Object.keys(contextFilterState).forEach(function (context) {
+                    var value = contextFilterState[context];
+                    if (typeof value === 'boolean') {
+                        if (value) {
+                            // The entire context is selected
+                            contextConditions.push({ context: context });
+                        }
+                    }
+                    else {
+                        // The context has subcontexts
+                        var subcontexts = Object.keys(value).filter(function (subcontext) {
+                            return value[subcontext];
+                        });
+                        if (subcontexts.length > 0) {
+                            contextConditions.push({
+                                context: context,
+                                subcontext: { $in: subcontexts },
+                            });
+                        }
+                    }
+                });
+                if (contextConditions.length > 0) {
+                    query.$or = contextConditions;
+                }
+                selectedTags = Object.keys(tagFilterState).filter(function (tag) { return tagFilterState[tag]; });
+                if (selectedTags.length > 0) {
+                    query.tags = { $in: selectedTags };
+                }
+                /* --------- Action/Error Filter ---------- */
+                if (actionErrorFilterState.type) {
+                    query.type = actionErrorFilterState.type;
+                }
+                if (actionErrorFilterState.type === dce_reactkit_1.LogType.Error) {
+                    if (actionErrorFilterState.errorMessage) {
+                        // Add error message to the query.
+                        // $i is used for case-insensitive search, and $regex is used for partial matching
+                        query.errorMessage = {
+                            $regex: actionErrorFilterState.errorMessage,
+                            $options: 'i',
+                        };
+                    }
+                    if (actionErrorFilterState.errorCode) {
+                        query.errorCode = {
+                            $regex: actionErrorFilterState.errorCode,
+                            $options: 'i',
+                        };
+                    }
+                }
+                if (actionErrorFilterState.type === dce_reactkit_1.LogType.Action) {
+                    selectedTargets = (Object.keys(actionErrorFilterState.target)
+                        .filter(function (target) {
+                        return actionErrorFilterState.target[target];
+                    }));
+                    selectedActions = (Object.keys(actionErrorFilterState.action)
+                        .filter(function (action) {
+                        return actionErrorFilterState.action[action];
+                    }));
+                    if (selectedTargets.length > 0) {
+                        query.target = { $in: selectedTargets };
+                    }
+                    if (selectedActions.length > 0) {
+                        query.action = { $in: selectedActions };
+                    }
+                }
+                /* ------------ Advanced Filter ----------- */
+                if (advancedFilterState.userFirstName) {
+                    query.userFirstName = {
+                        $regex: advancedFilterState.userFirstName,
+                        $options: 'i',
+                    };
+                }
+                if (advancedFilterState.userLastName) {
+                    query.userLastName = {
+                        $regex: advancedFilterState.userLastName,
+                        $options: 'i',
+                    };
+                }
+                if (advancedFilterState.userEmail) {
+                    query.userEmail = {
+                        $regex: advancedFilterState.userEmail,
+                        $options: 'i',
+                    };
+                }
+                if (advancedFilterState.userId) {
+                    query.userId = Number.parseInt(advancedFilterState.userId, 10);
+                }
+                roles = [];
+                if (advancedFilterState.includeLearners) {
+                    roles.push({ isLearner: true });
+                }
+                if (advancedFilterState.includeTTMs) {
+                    roles.push({ isTTM: true });
+                }
+                if (advancedFilterState.includeAdmins) {
+                    roles.push({ isAdmin: true });
+                }
+                // If any roles are selected, add them to the query
+                if (roles.length > 0) {
+                    // The $or operator is used to match any of the roles
+                    // The $and operator is to ensure that other conditions in the query are met
+                    query.$and = [{ $or: roles }];
+                }
+                if (advancedFilterState.courseId) {
+                    query.courseId = Number.parseInt(advancedFilterState.courseId, 10);
+                }
+                if (advancedFilterState.courseName) {
+                    query.courseName = {
+                        $regex: advancedFilterState.courseName,
+                        $options: 'i',
+                    };
+                }
+                if (advancedFilterState.isMobile !== undefined) {
+                    query['device.isMobile'] = Boolean(advancedFilterState.isMobile);
+                }
+                if (advancedFilterState.source) {
+                    query.source = advancedFilterState.source;
+                }
+                if (advancedFilterState.routePath) {
+                    query.routePath = {
+                        $regex: advancedFilterState.routePath,
+                        $options: 'i',
+                    };
+                }
+                if (advancedFilterState.routeTemplate) {
+                    query.routeTemplate = {
+                        $regex: advancedFilterState.routeTemplate,
+                        $options: 'i',
+                    };
+                }
+                return [4 /*yield*/, logCollection.findPaged({
+                        query: query,
+                        perPage: LOG_REVIEW_PAGE_SIZE_1.default,
+                        pageNumber: pageNumber,
+                        sortDescending: true,
+                    })];
+            case 1:
+                response = _d.sent();
+                if (!countDocuments) return [3 /*break*/, 3];
+                _c = (_b = Math).ceil;
+                return [4 /*yield*/, logCollection.count(query)];
+            case 2:
+                numPages = _c.apply(_b, [(_d.sent())
+                        / LOG_REVIEW_PAGE_SIZE_1.default]);
+                return [2 /*return*/, __assign(__assign({}, response), { numPages: numPages })];
+            case 3: 
+            // Return response
+            return [2 /*return*/, response];
+        }
+    });
+}); };
+exports.default = getLogReviewerLogs;
+//# sourceMappingURL=getLogReviewerLogs.js.map

package/lib/helpers/getLogReviewerLogs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLogReviewerLogs.js","sourceRoot":"","sources":["../../src/helpers/getLogReviewerLogs.ts"],"names":[],"mappings":"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"}

package/lib/helpers/initServer.js

@@ -55,7 +55,7 @@ exports.internalGetCrossServerCredentialCollection = exports.internalGetLogColle
 var dce_reactkit_1 = require("dce-reactkit");
 // Import shared helpers
 var genRouteHandler_1 = __importDefault(require("./genRouteHandler"));
-// Import shared types
+var getLogReviewerLogs_1 = __importDefault(require("./getLogReviewerLogs"));
 var ExpressKitErrorCode_1 = __importDefault(require("../types/ExpressKitErrorCode"));
 // Stored copy of dce-mango log collection
 var _logCollection;
@@ -247,38 +247,36 @@ var initServer = function (opts) {
         }); },
     }));
     /**
-     * Get all logs for a certain month
-     * @author Gabe Abrams
-     * @param {number} year the year to query (e.g. 2022)
-     * @param {number} month the month to query (e.g. 1 = January)
-     * @returns {Log[]} list of logs from the given month
+     * Get filtered logs based on provided filters
+     * @author Gabe Abrams, Yuen Ler Chow
+     * @param pageNumber the page number to get
+     * @param filters the filters to apply to the logs
+     * @returns {Log[]} list of logs that match the filters
      */
-    opts.app.get("".concat(dce_reactkit_1.LOG_REVIEW_ROUTE_PATH_PREFIX, "/years/:year/months/:month"), (0, genRouteHandler_1.default)({
+    opts.app.get(dce_reactkit_1.LOG_REVIEW_GET_LOGS_ROUTE, (0, genRouteHandler_1.default)({
         paramTypes: {
-            year: dce_reactkit_1.ParamType.Int,
-            month: dce_reactkit_1.ParamType.Int,
             pageNumber: dce_reactkit_1.ParamType.Int,
+            filters: dce_reactkit_1.ParamType.JSON,
+            countDocuments: dce_reactkit_1.ParamType.Boolean,
         },
         handler: function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-            var year, month, pageNumber, userId, isAdmin, canReview, response;
+            var pageNumber, userId, isAdmin, filters, countDocuments, canReview, response;
             var params = _b.params;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        year = params.year, month = params.month, pageNumber = params.pageNumber, userId = params.userId, isAdmin = params.isAdmin;
+                        pageNumber = params.pageNumber, userId = params.userId, isAdmin = params.isAdmin, filters = params.filters, countDocuments = params.countDocuments;
                         return [4 /*yield*/, canReviewLogs(userId, isAdmin)];
                     case 1:
                         canReview = _c.sent();
                         if (!canReview) {
                             throw new dce_reactkit_1.ErrorWithCode('You cannot access this resource because you do not have the appropriate permissions.', ExpressKitErrorCode_1.default.NotAllowedToReviewLogs);
                         }
-                        return [4 /*yield*/, _logCollection.findPaged({
-                                query: {
-                                    year: year,
-                                    month: month,
-                                },
-                                perPage: 1000,
+                        return [4 /*yield*/, (0, getLogReviewerLogs_1.default)({
                                 pageNumber: pageNumber,
+                                filters: filters,
+                                countDocuments: countDocuments,
+                                logCollection: _logCollection,
                             })];
                     case 2:
                         response = _c.sent();

package/lib/helpers/initServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"initServer.js","sourceRoot":"","sources":["../../src/helpers/initServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"initServer.js","sourceRoot":"","sources":["../../src/helpers/initServer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "dce-expresskit",
-  "version": "4.0.0-beta.9",
+  "version": "4.0.0-log-reviewer-beta.10",
   "description": "Shared functions, helpers, and tools for Harvard DCE Express-based servers",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
     "build": "tsc --project ./tsconfig.json",
-    "gen-cross-server-secret": "npx tsx genEncodedSecret.ts",
-    "gen-cross-server-salt": "npx tsx genSalt.ts"
+    "gen-cross-server-secret": "npx tsx genEncodedSecret.ts"
   },
   "repository": {
     "type": "git",
@@ -25,7 +24,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "bootstrap": "^5.3.3",
-    "dce-reactkit": "^4.0.0-beta.2",
+    "dce-reactkit": "^4.0.0-beta-logreviewer.1",
     "react": "^19.0.0"
   },
   "peerDependencies": {

package/src/constants/LOG_REVIEW_PAGE_SIZE.ts

@@ -0,0 +1,7 @@
+/**
+ * Log reviewer page size
+ * @author Yuen Ler Chow
+ */
+const LOG_REVIEW_PAGE_SIZE = 100;
+
+export default LOG_REVIEW_PAGE_SIZE;

package/src/helpers/dataSigner.ts

@@ -172,6 +172,7 @@ export const signRequest = async (
   // Add signature to the augmented params
   augmentedParams.oauth_signature = signature;
 
+
   // Return the augmented params
   return augmentedParams;
 };
@@ -233,6 +234,7 @@ export const validateSignedRequest = async (
     method,
     path,
     params,
+    scope,
   } = opts;
 
   /* ------- Look Up Credential ------- */
@@ -258,7 +260,14 @@ export const validateSignedRequest = async (
 
   // Make sure the scope is included
   const allowedScopes = crossServerCredential.scopes;
-  if (!allowedScopes || !Array.isArray(allowedScopes) || !allowedScopes.includes(opts.scope)) {
+  if (!allowedScopes || !Array.isArray(allowedScopes)) {
+    throw new ErrorWithCode(
+      'Could not validate a cross-server request because the credential does not have access to any scopes.',
+      ExpressKitErrorCode.SignedRequestInvalidScope,
+    );
+
+  }
+  if (!allowedScopes.includes(scope)) {
     throw new ErrorWithCode(
       'Could not validate a cross-server request because the required scope was not approved for the credential.',
       ExpressKitErrorCode.SignedRequestInvalidScope,
@@ -270,11 +279,24 @@ export const validateSignedRequest = async (
 
   /* -------- Verify Signature -------- */
 
+  // Curate what goes into the params
+  const paramsToSign: {
+    [key: string]: any,
+  } = {
+    ...params,
+  };
+  Object.keys(paramsToSign).forEach((key) => {
+    // Delete oauth params
+    if (key.startsWith('oauth_')) {
+      delete paramsToSign[key];
+    }
+  });
+
   // Generate a new signature to compare
   const expectedSignature = await genSignature({
     method,
     path,
-    params,
+    params: paramsToSign,
     secret,
   });
 
@@ -288,7 +310,7 @@ export const validateSignedRequest = async (
 
   // Make sure the timestamp was recent enough
   const elapsedMs = Math.abs(Date.now() - timestamp);
-  if (elapsedMs < MINUTE_IN_MS) {
+  if (elapsedMs > MINUTE_IN_MS) {
     throw new ErrorWithCode(
       'Could not validate a cross-server request because the request was too old.',
       ExpressKitErrorCode.SignedRequestInvalidTimestamp,

package/src/helpers/getLogReviewerLogs.ts

@@ -0,0 +1,259 @@
+// Import dce-reactkit
+import {  
+  DAY_IN_MS,
+  Log,
+  LogReviewerFilterState, 
+  LogType 
+} from 'dce-reactkit';
+
+// Import shared types
+import LOG_REVIEW_PAGE_SIZE from '../constants/LOG_REVIEW_PAGE_SIZE';
+import { Collection } from 'dce-mango';
+
+/**
+ * Get logs for the log reviewer interface
+ * @author Yuen Ler Chow
+ * @param opts object containing all arguments
+ * @param opts.pageNumber the page number to retrieve (1-indexed)
+ * @param opts.filters filter criteria for logs
+ * @param opts.countDocuments if true, count number of documents matching
+ *   filters and return num pages (not always required because if changing pages,
+ *   we don't need to recount documents)
+ * @param opts.logCollection MongoDB collection containing logs
+ * @returns object with logs for the requested page and optionally total number of pages
+ */
+const getLogReviewerLogs = async (
+  opts: {
+    pageNumber: number,
+    filters: LogReviewerFilterState,
+    countDocuments: boolean,
+    logCollection: Collection<Log>,
+  },
+) => {
+
+  // Destructure opts
+  const {
+    pageNumber,
+    filters,
+    countDocuments,
+    logCollection,
+  } = opts;
+  
+
+  // Destructure filters
+  const {
+    dateFilterState,
+    contextFilterState,
+    tagFilterState,
+    actionErrorFilterState,
+    advancedFilterState,
+  } = filters as LogReviewerFilterState;
+
+  // Build MongoDB query based on filters
+  const query: { [k: string]: any } = {};
+
+  /* -------------- Date Filter ------------- */
+
+  // Convert start and end dates from the dateFilterState into timestamps
+  const { startDate, endDate } = dateFilterState;
+  const startTimestamp = new Date(
+    `${startDate.month}/${startDate.day}/${startDate.year}`,
+  ).getTime();
+  const endTimestamp = (
+    (new Date(`${endDate.month}/${endDate.day}/${endDate.year}`)).getTime()
+    + DAY_IN_MS
+  );
+
+  // Add a date range condition to the query
+  query.timestamp = {
+    $gte: startTimestamp,
+    $lt: endTimestamp,
+  };
+
+  /* ------------ Context Filter ------------ */
+
+  // Process context filters to include selected contexts and subcontexts
+  const contextConditions: { [k: string]: any }[] = [];
+  Object.keys(contextFilterState).forEach((context) => {
+    const value = contextFilterState[context];
+    if (typeof value === 'boolean') {
+      if (value) {
+        // The entire context is selected
+        contextConditions.push({ context });
+      }
+    } else {
+      // The context has subcontexts
+      const subcontexts = Object.keys(value).filter((subcontext) => {
+        return value[subcontext];
+      });
+
+      if (subcontexts.length > 0) {
+        contextConditions.push({
+          context,
+          subcontext: { $in: subcontexts },
+        });
+      }
+    }
+  });
+  if (contextConditions.length > 0) {
+    query.$or = contextConditions;
+  }
+
+  /* -------------- Tag Filter -------------- */
+
+  const selectedTags = Object.keys(tagFilterState).filter((tag) => { return tagFilterState[tag]; });
+  if (selectedTags.length > 0) {
+    query.tags = { $in: selectedTags };
+  }
+
+  /* --------- Action/Error Filter ---------- */
+
+  if (actionErrorFilterState.type) {
+    query.type = actionErrorFilterState.type;
+  }
+
+  if (actionErrorFilterState.type === LogType.Error) {
+    if (actionErrorFilterState.errorMessage) {
+      // Add error message to the query.
+      // $i is used for case-insensitive search, and $regex is used for partial matching
+      query.errorMessage = {
+        $regex: actionErrorFilterState.errorMessage,
+        $options: 'i',
+      };
+    }
+
+    if (actionErrorFilterState.errorCode) {
+      query.errorCode = {
+        $regex: actionErrorFilterState.errorCode,
+        $options: 'i',
+      };
+    }
+  }
+
+  if (actionErrorFilterState.type === LogType.Action) {
+    const selectedTargets = (
+      Object.keys(actionErrorFilterState.target)
+        .filter((target) => {
+          return actionErrorFilterState.target[target];
+        })
+    );
+    const selectedActions = (
+      Object.keys(actionErrorFilterState.action)
+        .filter((action) => {
+          return actionErrorFilterState.action[action];
+        })
+    );
+    if (selectedTargets.length > 0) {
+      query.target = { $in: selectedTargets };
+    }
+    if (selectedActions.length > 0) {
+      query.action = { $in: selectedActions };
+    }
+  }
+
+  /* ------------ Advanced Filter ----------- */
+
+  if (advancedFilterState.userFirstName) {
+    query.userFirstName = {
+      $regex: advancedFilterState.userFirstName,
+      $options: 'i',
+    };
+  }
+
+  if (advancedFilterState.userLastName) {
+    query.userLastName = {
+      $regex: advancedFilterState.userLastName,
+      $options: 'i',
+    };
+  }
+
+  if (advancedFilterState.userEmail) {
+    query.userEmail = {
+      $regex: advancedFilterState.userEmail,
+      $options: 'i',
+    };
+  }
+
+  if (advancedFilterState.userId) {
+    query.userId = Number.parseInt(advancedFilterState.userId, 10);
+  }
+
+  const roles: {
+    isLearner?: boolean,
+    isTTM?: boolean,
+    isAdmin?: boolean,
+  }[] = [];
+  if (advancedFilterState.includeLearners) {
+    roles.push({ isLearner: true });
+  }
+  if (advancedFilterState.includeTTMs) {
+    roles.push({ isTTM: true });
+  }
+  if (advancedFilterState.includeAdmins) {
+    roles.push({ isAdmin: true });
+  }
+  // If any roles are selected, add them to the query
+  if (roles.length > 0) {
+    // The $or operator is used to match any of the roles
+    // The $and operator is to ensure that other conditions in the query are met
+    query.$and = [{ $or: roles }];
+  }
+
+  if (advancedFilterState.courseId) {
+    query.courseId = Number.parseInt(advancedFilterState.courseId, 10);
+  }
+
+  if (advancedFilterState.courseName) {
+    query.courseName = {
+      $regex: advancedFilterState.courseName,
+      $options: 'i',
+    };
+  }
+
+  if (advancedFilterState.isMobile !== undefined) {
+    query['device.isMobile'] = Boolean(advancedFilterState.isMobile);
+  }
+
+  if (advancedFilterState.source) {
+    query.source = advancedFilterState.source;
+  }
+
+  if (advancedFilterState.routePath) {
+    query.routePath = {
+      $regex: advancedFilterState.routePath,
+      $options: 'i',
+    };
+  }
+
+  if (advancedFilterState.routeTemplate) {
+    query.routeTemplate = {
+      $regex: advancedFilterState.routeTemplate,
+      $options: 'i',
+    };
+  }
+
+  // Query for logs
+  const response = await logCollection.findPaged({
+    query,
+    perPage: LOG_REVIEW_PAGE_SIZE,
+    pageNumber,
+    sortDescending: true,
+  });
+
+  // Count documents if requested
+  if (countDocuments) {
+    const numPages = Math.ceil(
+      await logCollection.count(query)
+      / LOG_REVIEW_PAGE_SIZE
+  );
+    return {
+      ...response,
+      numPages,
+    };
+  }
+
+  // Return response
+  return response;
+};
+
+export default getLogReviewerLogs;

package/src/helpers/initServer.ts

@@ -6,21 +6,22 @@ import { Collection } from 'dce-mango';
 
 // Import dce-reactkit
 import {
-  ErrorWithCode,
   ParamType,
   LogFunction,
-  LOG_REVIEW_ROUTE_PATH_PREFIX,
   LOG_ROUTE_PATH,
   LOG_REVIEW_STATUS_ROUTE,
   Log,
+  LOG_REVIEW_GET_LOGS_ROUTE,
+  ErrorWithCode,
 } from 'dce-reactkit';
 
 // Import shared helpers
 import genRouteHandler from './genRouteHandler';
+import getLogReviewerLogs from './getLogReviewerLogs';
 
 // Import shared types
-import ExpressKitErrorCode from '../types/ExpressKitErrorCode';
 import CrossServerCredential from '../types/CrossServerCredential';
+import ExpressKitErrorCode from '../types/ExpressKitErrorCode';
 
 // Stored copy of dce-mango log collection
 let _logCollection: Collection<Log>;
@@ -231,28 +232,28 @@ const initServer = (
   );
 
   /**
-   * Get all logs for a certain month
-   * @author Gabe Abrams
-   * @param {number} year the year to query (e.g. 2022)
-   * @param {number} month the month to query (e.g. 1 = January)
-   * @returns {Log[]} list of logs from the given month
+   * Get filtered logs based on provided filters
+   * @author Gabe Abrams, Yuen Ler Chow
+   * @param pageNumber the page number to get
+   * @param filters the filters to apply to the logs
+   * @returns {Log[]} list of logs that match the filters
    */
   opts.app.get(
-    `${LOG_REVIEW_ROUTE_PATH_PREFIX}/years/:year/months/:month`,
+    LOG_REVIEW_GET_LOGS_ROUTE,
     genRouteHandler({
       paramTypes: {
-        year: ParamType.Int,
-        month: ParamType.Int,
         pageNumber: ParamType.Int,
+        filters: ParamType.JSON,
+        countDocuments: ParamType.Boolean,
       },
       handler: async ({ params }) => {
-        // Get user info
+        // Destructure params
         const {
-          year,
-          month,
           pageNumber,
           userId,
           isAdmin,
+          filters,
+          countDocuments,
         } = params;
 
         // Validate user
@@ -264,14 +265,12 @@ const initServer = (
           );
         }
 
-        // Query for logs
-        const response = await _logCollection.findPaged({
-          query: {
-            year,
-            month,
-          },
-          perPage: 1000,
+        // Get logs
+        const response = await getLogReviewerLogs({
           pageNumber,
+          filters,
+          countDocuments,
+          logCollection: _logCollection,
         });
 
         // Return response

package/genSalt.ts

@@ -1,15 +0,0 @@
-// All chars for randomizer
-const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
-// Generate a random salt
-let salt = '';
-for (let i = 0; i < 32; i++) {
-  salt += chars.charAt(Math.floor(Math.random() * chars.length));
-}
-salt = Buffer.from(salt).toString('base64');
-
-// Generates 32 byte salt
-console.log('New *receiving* server salt:')
-
-Buffer.from("Hello World").toString('base64')
-console.log(salt);

package/src/constants/LOG_REVIEW_ROUTE_PATH_PREFIX.ts

@@ -1,9 +0,0 @@
-import ROUTE_PATH_PREFIX from './ROUTE_PATH_PREFIX';
-
-/**
- * Path of the route for storing client-side logs
- * @author Gabe Abrams
- */
-const LOG_REVIEW_ROUTE_PATH_PREFIX = `/admin${ROUTE_PATH_PREFIX}/logs`;
-
-export default LOG_REVIEW_ROUTE_PATH_PREFIX;

package/src/constants/LOG_REVIEW_STATUS_ROUTE.ts

@@ -1,10 +0,0 @@
-import ROUTE_PATH_PREFIX from './ROUTE_PATH_PREFIX';
-
-/**
- * Route for checking the status of the current user's
- *   access to log review
- * @author Gabe Abrams
- */
-const LOG_REVIEW_STATUS_ROUTE = `${ROUTE_PATH_PREFIX}/logs/access_allowed`;
-
-export default LOG_REVIEW_STATUS_ROUTE;

package/src/constants/LOG_ROUTE_PATH.ts

@@ -1,9 +0,0 @@
-import ROUTE_PATH_PREFIX from './ROUTE_PATH_PREFIX';
-
-/**
- * Path of the route for storing client-side logs
- * @author Gabe Abrams
- */
-const LOG_ROUTE_PATH = `${ROUTE_PATH_PREFIX}/log`;
-
-export default LOG_ROUTE_PATH;

package/src/constants/ROUTE_PATH_PREFIX.ts

@@ -1,7 +0,0 @@
-/**
- * Path that all routes start with
- * @author Gabe Abrams
- */
-const ROUTE_PATH_PREFIX = '/dce-expresskit';
-
-export default ROUTE_PATH_PREFIX;

package/src/errors/ErrorWithCode.tsx

@@ -1,15 +0,0 @@
-/**
- * An error with a code
- * @author Gabe Abrams
- */
-class ErrorWithCode extends Error {
-  code: string;
-
-  constructor(message: string, code: string) {
-    super(message);
-    this.name = 'ErrorWithCode';
-    this.code = code;
-  }
-}
-
-export default ErrorWithCode;