dce-expresskit 4.1.0 → 4.2.1

package/lib/helpers/initServer.js

@@ -50,7 +50,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.internalGetCrossServerCredentialCollection = exports.internalGetLogCollection = void 0;
 // Import dce-reactkit
 var dce_reactkit_1 = require("dce-reactkit");
 // Import shared helpers
@@ -58,33 +57,8 @@ var genRouteHandler_1 = __importDefault(require("./genRouteHandler"));
 var getLogReviewerLogs_1 = __importDefault(require("./getLogReviewerLogs"));
 // Import shared types
 var ExpressKitErrorCode_1 = __importDefault(require("../types/ExpressKitErrorCode"));
-// Stored copy of dce-mango log collection
-var _logCollection;
-// Stored copy of dce-mango cross-server credential collection
-var _crossServerCredentialCollection;
-/*------------------------------------------------------------------------*/
-/*                                 Helpers                                */
-/*------------------------------------------------------------------------*/
-/**
- * Get log collection
- * @author Gabe Abrams
- * @returns log collection if one was included during launch or null if we don't
- *   have a log collection (yet)
- */
-var internalGetLogCollection = function () {
-    return _logCollection !== null && _logCollection !== void 0 ? _logCollection : null;
-};
-exports.internalGetLogCollection = internalGetLogCollection;
-/**
- * Get cross-server credential collection
- * @author Gabe Abrams
- * @return cross-server credential collection if one was included during launch or null
- *   if we don't have a cross-server credential collection (yet)
- */
-var internalGetCrossServerCredentialCollection = function () {
-    return _crossServerCredentialCollection !== null && _crossServerCredentialCollection !== void 0 ? _crossServerCredentialCollection : null;
-};
-exports.internalGetCrossServerCredentialCollection = internalGetCrossServerCredentialCollection;
+// Import shared helpers
+var initExpressKitCollections_1 = require("./initExpressKitCollections");
 /*------------------------------------------------------------------------*/
 /*                                  Main                                  */
 /*------------------------------------------------------------------------*/
@@ -94,23 +68,8 @@ exports.internalGetCrossServerCredentialCollection = internalGetCrossServerCrede
  * @param opts object containing all arguments
  * @param opts.app express app from inside of the postprocessor function that
  *   we will add routes to
- * @param opts.getLaunchInfo CACCL LTI's get launch info function
- * @param [opts.logCollection] mongo collection from dce-mango to use for
- *   storing logs. If none is included, logs are written to the console
- * @param [opts.logReviewAdmins=all] info on which admins can review
- *   logs from the client. If not included, all Canvas admins are allowed to
- *   review logs. If null, no Canvas admins are allowed to review logs.
- *   If an array of Canvas userIds (numbers), only Canvas admins with those
- *   userIds are allowed to review logs. If a dce-mango collection, only
- *   Canvas admins with entries in that collection ({ userId, ...}) are allowed
- *   to review logs
- * @param [opts.crossServerCredentialCollection] mongo collection from dce-mango to use for
- *   storing cross-server credentials. If none is included, cross-server credentials
- *   are not supported
  */
 var initServer = function (opts) {
-    _logCollection = opts.logCollection;
-    _crossServerCredentialCollection = opts.crossServerCredentialCollection;
     /*----------------------------------------*/
     /*                Logging                 */
     /*----------------------------------------*/
@@ -131,6 +90,10 @@ var initServer = function (opts) {
      * @param {string} [target] Target of the action (each app determines the list
      *   of targets) These are usually buttons, panels, elements, etc.
      * @param {LogAction} [action] the type of action performed on the target
+     * @param {object} [overriddenUserInfo] object containing info to override
+     * @param {number} [opts.userId] overriding Canvas id of the user performing the action
+     * @param {string} [opts.userFirstName] overriding first name of the user performing the action
+     * @param {string} [opts.userLastName] overriding last name of the user performing the action
      * @returns {Log}
      */
     opts.app.post(dce_reactkit_1.LOG_ROUTE_PATH, (0, genRouteHandler_1.default)({
@@ -145,6 +108,7 @@ var initServer = function (opts) {
             errorStack: dce_reactkit_1.ParamType.StringOptional,
             target: dce_reactkit_1.ParamType.StringOptional,
             action: dce_reactkit_1.ParamType.StringOptional,
+            overriddenUserInfo: dce_reactkit_1.ParamType.JSONOptional,
         },
         handler: function (_a) {
             var params = _a.params, logServerEvent = _a.logServerEvent;
@@ -162,6 +126,9 @@ var initServer = function (opts) {
                         code: params.errorCode,
                         stack: params.errorStack,
                     },
+                    userId: (params.overriddenUserInfo ? params.overriddenUserInfo.userId : undefined),
+                    userFirstName: (params.overriddenUserInfo ? params.overriddenUserInfo.userFirstName : undefined),
+                    userLastName: (params.overriddenUserInfo ? params.overriddenUserInfo.userLastName : undefined),
                 }
                 // Action
                 : {
@@ -172,6 +139,9 @@ var initServer = function (opts) {
                     metadata: params.metadata,
                     target: params.target,
                     action: params.action,
+                    userId: (params.overriddenUserInfo ? params.overriddenUserInfo.userId : undefined),
+                    userFirstName: (params.overriddenUserInfo ? params.overriddenUserInfo.userFirstName : undefined),
+                    userLastName: (params.overriddenUserInfo ? params.overriddenUserInfo.userLastName : undefined),
                 });
             // Add hidden boolean to change source to "client"
             var logInfoForcedFromClient = __assign(__assign({}, logInfo), { overrideAsClientEvent: true });
@@ -192,7 +162,7 @@ var initServer = function (opts) {
      * @returns true if the user can review logs
      */
     var canReviewLogs = function (userId, isAdmin) { return __awaiter(void 0, void 0, void 0, function () {
-        var matches, err_1;
+        var logReviewerAdminCollection, matches, err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -200,29 +170,22 @@ var initServer = function (opts) {
                     if (!isAdmin) {
                         return [2 /*return*/, false];
                     }
-                    // If all admins are allowed, we're done
-                    if (!opts.logReviewAdmins) {
-                        return [2 /*return*/, true];
-                    }
-                    _a.label = 1;
+                    return [4 /*yield*/, (0, initExpressKitCollections_1.internalGetLogReviewerAdminCollection)()];
                 case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    // Array of userIds
-                    if (Array.isArray(opts.logReviewAdmins)) {
-                        return [2 /*return*/, opts.logReviewAdmins.some(function (allowedId) {
-                                return (userId === allowedId);
-                            })];
-                    }
-                    return [4 /*yield*/, opts.logReviewAdmins.find({ userId: userId })];
+                    logReviewerAdminCollection = _a.sent();
+                    _a.label = 2;
                 case 2:
+                    _a.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, logReviewerAdminCollection.find({ id: userId })];
+                case 3:
                     matches = _a.sent();
                     // Make sure at least one entry matches
                     return [2 /*return*/, matches.length > 0];
-                case 3:
+                case 4:
                     err_1 = _a.sent();
                     // If an error occurred, simply return false
                     return [2 /*return*/, false];
-                case 4: return [2 /*return*/];
+                case 5: return [2 /*return*/];
             }
         });
     }); };
@@ -242,6 +205,7 @@ var initServer = function (opts) {
                         return [4 /*yield*/, canReviewLogs(userId, isAdmin)];
                     case 1:
                         canReview = _c.sent();
+                        // Return result
                         return [2 /*return*/, canReview];
                 }
             });
@@ -249,7 +213,8 @@ var initServer = function (opts) {
     }));
     /**
      * Get filtered logs based on provided filters
-     * @author Gabe Abrams, Yuen Ler Chow
+     * @author Gabe Abrams
+     * @author 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
@@ -261,7 +226,7 @@ var initServer = function (opts) {
             countDocuments: dce_reactkit_1.ParamType.Boolean,
         },
         handler: function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-            var pageNumber, userId, isAdmin, filters, countDocuments, canReview, response;
+            var pageNumber, userId, isAdmin, filters, countDocuments, canReview, logCollection, response;
             var params = _b.params;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -273,13 +238,16 @@ var initServer = function (opts) {
                         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*/, (0, initExpressKitCollections_1.internalGetLogCollection)()];
+                    case 2:
+                        logCollection = _c.sent();
                         return [4 /*yield*/, (0, getLogReviewerLogs_1.default)({
                                 pageNumber: pageNumber,
                                 filters: filters,
                                 countDocuments: countDocuments,
-                                logCollection: _logCollection,
+                                logCollection: logCollection,
                             })];
-                    case 2:
+                    case 3:
                         response = _c.sent();
                         // Return response
                         return [2 /*return*/, response];

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/lib/index.d.ts

@@ -1,11 +1,10 @@
 import { abbreviate, avg, ceilToNumDecimals, floorToNumDecimals, forceNumIntoBounds, padDecimalZeros, padZerosLeft, roundToNumDecimals, sum, waitMs, getOrdinal, getTimeInfoInET, startMinWait, getHumanReadableDate, getPartOfDay, stringsToHumanReadableList, onlyKeepLetters, parallelLimit, getMonthName, genCSV, extractProp, compareArraysByProp, getLocalTimeInfo, genCommaList, prefixWithAOrAn, everyAsync, filterAsync, forEachAsync, mapAsync, someAsync, capitalize, shuffleArray, DayOfWeek, Log, LogType, LogSource, LogAction, LogBuiltInMetadata, LogMetadataType, LogFunction, MINUTE_IN_MS, HOUR_IN_MS, DAY_IN_MS, ErrorWithCode, ParamType } from 'dce-reactkit';
-import initCrossServerCredentialCollection from './helpers/initCrossServerCredentialCollection';
-import initLogCollection from './helpers/initLogCollection';
 import initServer from './helpers/initServer';
 import genRouteHandler from './helpers/genRouteHandler';
 import handleError from './helpers/handleError';
 import handleSuccess from './helpers/handleSuccess';
 import addDBEditorEndpoints from './helpers/addDBEditorEndpoints';
 import visitEndpointOnAnotherServer from './helpers/visitEndpointOnAnotherServer';
+import initExpressKitCollections from './helpers/initExpressKitCollections';
 import CrossServerCredential from './types/CrossServerCredential';
-export { ErrorWithCode, MINUTE_IN_MS, HOUR_IN_MS, DAY_IN_MS, abbreviate, avg, ceilToNumDecimals, floorToNumDecimals, forceNumIntoBounds, padDecimalZeros, padZerosLeft, roundToNumDecimals, sum, waitMs, getOrdinal, getTimeInfoInET, startMinWait, getHumanReadableDate, getPartOfDay, stringsToHumanReadableList, onlyKeepLetters, parallelLimit, getMonthName, genCSV, extractProp, compareArraysByProp, genCommaList, getLocalTimeInfo, prefixWithAOrAn, everyAsync, filterAsync, forEachAsync, mapAsync, someAsync, capitalize, shuffleArray, initServer, genRouteHandler, handleError, handleSuccess, initLogCollection, initCrossServerCredentialCollection, addDBEditorEndpoints, visitEndpointOnAnotherServer, DayOfWeek, Log, LogType, LogSource, LogAction, LogBuiltInMetadata, LogMetadataType, LogFunction, CrossServerCredential, ParamType, };
+export { ErrorWithCode, MINUTE_IN_MS, HOUR_IN_MS, DAY_IN_MS, abbreviate, avg, ceilToNumDecimals, floorToNumDecimals, forceNumIntoBounds, padDecimalZeros, padZerosLeft, roundToNumDecimals, sum, waitMs, getOrdinal, getTimeInfoInET, startMinWait, getHumanReadableDate, getPartOfDay, stringsToHumanReadableList, onlyKeepLetters, parallelLimit, getMonthName, genCSV, extractProp, compareArraysByProp, genCommaList, getLocalTimeInfo, prefixWithAOrAn, everyAsync, filterAsync, forEachAsync, mapAsync, someAsync, capitalize, shuffleArray, initServer, genRouteHandler, handleError, handleSuccess, initExpressKitCollections, addDBEditorEndpoints, visitEndpointOnAnotherServer, DayOfWeek, Log, LogType, LogSource, LogAction, LogBuiltInMetadata, LogMetadataType, LogFunction, CrossServerCredential, ParamType, };

package/lib/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParamType = exports.LogBuiltInMetadata = exports.LogAction = exports.LogSource = exports.LogType = exports.DayOfWeek = exports.visitEndpointOnAnotherServer = exports.addDBEditorEndpoints = exports.initCrossServerCredentialCollection = exports.initLogCollection = exports.handleSuccess = exports.handleError = exports.genRouteHandler = exports.initServer = exports.shuffleArray = exports.capitalize = exports.someAsync = exports.mapAsync = exports.forEachAsync = exports.filterAsync = exports.everyAsync = exports.prefixWithAOrAn = exports.getLocalTimeInfo = exports.genCommaList = exports.compareArraysByProp = exports.extractProp = exports.genCSV = exports.getMonthName = exports.parallelLimit = exports.onlyKeepLetters = exports.stringsToHumanReadableList = exports.getPartOfDay = exports.getHumanReadableDate = exports.startMinWait = exports.getTimeInfoInET = exports.getOrdinal = exports.waitMs = exports.sum = exports.roundToNumDecimals = exports.padZerosLeft = exports.padDecimalZeros = exports.forceNumIntoBounds = exports.floorToNumDecimals = exports.ceilToNumDecimals = exports.avg = exports.abbreviate = exports.DAY_IN_MS = exports.HOUR_IN_MS = exports.MINUTE_IN_MS = exports.ErrorWithCode = void 0;
+exports.ParamType = exports.LogBuiltInMetadata = exports.LogAction = exports.LogSource = exports.LogType = exports.DayOfWeek = exports.visitEndpointOnAnotherServer = exports.addDBEditorEndpoints = exports.initExpressKitCollections = exports.handleSuccess = exports.handleError = exports.genRouteHandler = exports.initServer = exports.shuffleArray = exports.capitalize = exports.someAsync = exports.mapAsync = exports.forEachAsync = exports.filterAsync = exports.everyAsync = exports.prefixWithAOrAn = exports.getLocalTimeInfo = exports.genCommaList = exports.compareArraysByProp = exports.extractProp = exports.genCSV = exports.getMonthName = exports.parallelLimit = exports.onlyKeepLetters = exports.stringsToHumanReadableList = exports.getPartOfDay = exports.getHumanReadableDate = exports.startMinWait = exports.getTimeInfoInET = exports.getOrdinal = exports.waitMs = exports.sum = exports.roundToNumDecimals = exports.padZerosLeft = exports.padDecimalZeros = exports.forceNumIntoBounds = exports.floorToNumDecimals = exports.ceilToNumDecimals = exports.avg = exports.abbreviate = exports.DAY_IN_MS = exports.HOUR_IN_MS = exports.MINUTE_IN_MS = exports.ErrorWithCode = void 0;
 // Import dce-reactkit
 var dce_reactkit_1 = require("dce-reactkit");
 Object.defineProperty(exports, "abbreviate", { enumerable: true, get: function () { return dce_reactkit_1.abbreviate; } });
@@ -49,10 +49,6 @@ Object.defineProperty(exports, "DAY_IN_MS", { enumerable: true, get: function ()
 Object.defineProperty(exports, "ErrorWithCode", { enumerable: true, get: function () { return dce_reactkit_1.ErrorWithCode; } });
 Object.defineProperty(exports, "ParamType", { enumerable: true, get: function () { return dce_reactkit_1.ParamType; } });
 // Import helpers
-var initCrossServerCredentialCollection_1 = __importDefault(require("./helpers/initCrossServerCredentialCollection"));
-exports.initCrossServerCredentialCollection = initCrossServerCredentialCollection_1.default;
-var initLogCollection_1 = __importDefault(require("./helpers/initLogCollection"));
-exports.initLogCollection = initLogCollection_1.default;
 var initServer_1 = __importDefault(require("./helpers/initServer"));
 exports.initServer = initServer_1.default;
 var genRouteHandler_1 = __importDefault(require("./helpers/genRouteHandler"));
@@ -65,4 +61,6 @@ var addDBEditorEndpoints_1 = __importDefault(require("./helpers/addDBEditorEndpo
 exports.addDBEditorEndpoints = addDBEditorEndpoints_1.default;
 var visitEndpointOnAnotherServer_1 = __importDefault(require("./helpers/visitEndpointOnAnotherServer"));
 exports.visitEndpointOnAnotherServer = visitEndpointOnAnotherServer_1.default;
+var initExpressKitCollections_1 = __importDefault(require("./helpers/initExpressKitCollections"));
+exports.initExpressKitCollections = initExpressKitCollections_1.default;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,sBAAsB;AACtB,6CA8CsB;AAwBpB,2FArEA,yBAAU,OAqEA;AACV,oFArEA,kBAAG,OAqEA;AACH,kGArEA,gCAAiB,OAqEA;AACjB,mGArEA,iCAAkB,OAqEA;AAClB,mGArEA,iCAAkB,OAqEA;AAClB,gGArEA,8BAAe,OAqEA;AACf,6FArEA,2BAAY,OAqEA;AACZ,mGArEA,iCAAkB,OAqEA;AAClB,oFArEA,kBAAG,OAqEA;AACH,uFArEA,qBAAM,OAqEA;AACN,2FArEA,yBAAU,OAqEA;AACV,gGArEA,8BAAe,OAqEA;AACf,6FArEA,2BAAY,OAqEA;AACZ,qGArEA,mCAAoB,OAqEA;AACpB,6FArEA,2BAAY,OAqEA;AACZ,2GArEA,yCAA0B,OAqEA;AAC1B,gGArEA,8BAAe,OAqEA;AACf,8FArEA,4BAAa,OAqEA;AACb,6FArEA,2BAAY,OAqEA;AACZ,uFArEA,qBAAM,OAqEA;AACN,4FArEA,0BAAW,OAqEA;AACX,oGArEA,kCAAmB,OAqEA;AAEnB,iGAtEA,+BAAgB,OAsEA;AADhB,6FApEA,2BAAY,OAoEA;AAEZ,gGArEA,8BAAe,OAqEA;AACf,2FArEA,yBAAU,OAqEA;AACV,4FArEA,0BAAW,OAqEA;AACX,6FArEA,2BAAY,OAqEA;AACZ,yFArEA,uBAAQ,OAqEA;AACR,0FArEA,wBAAS,OAqEA;AACT,2FArEA,yBAAU,OAqEA;AACV,6FArEA,2BAAY,OAqEA;AAWZ,0FA/EA,wBAAS,OA+EA;AAET,wFA/EA,sBAAO,OA+EA;AACP,0FA/EA,wBAAS,OA+EA;AACT,0FA/EA,wBAAS,OA+EA;AACT,mGA/EA,iCAAkB,OA+EA;AAnDlB,6FAzBA,2BAAY,OAyBA;AACZ,2FAzBA,yBAAU,OAyBA;AACV,0FAzBA,wBAAS,OAyBA;AAJT,8FApBA,4BAAa,OAoBA;AA0Db,0FA7EA,wBAAS,OA6EA;AA1EX,iBAAiB;AACjB,sHAAgG;AA2D9F,8CA3DK,6CAAmC,CA2DL;AA1DrC,kFAA4D;AAyD1D,4BAzDK,2BAAiB,CAyDL;AAxDnB,oEAA8C;AAoD5C,qBApDK,oBAAU,CAoDL;AAnDZ,8EAAwD;AAoDtD,0BApDK,yBAAe,CAoDL;AAnDjB,sEAAgD;AAoD9C,sBApDK,qBAAW,CAoDL;AAnDb,0EAAoD;AAoDlD,wBApDK,uBAAa,CAoDL;AAnDf,wFAAkE;AAsDhE,+BAtDK,8BAAoB,CAsDL;AArDtB,wGAAkF;AAsDhF,uCAtDK,sCAA4B,CAsDL"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,sBAAsB;AACtB,6CA8CsB;AAuBpB,2FApEA,yBAAU,OAoEA;AACV,oFApEA,kBAAG,OAoEA;AACH,kGApEA,gCAAiB,OAoEA;AACjB,mGApEA,iCAAkB,OAoEA;AAClB,mGApEA,iCAAkB,OAoEA;AAClB,gGApEA,8BAAe,OAoEA;AACf,6FApEA,2BAAY,OAoEA;AACZ,mGApEA,iCAAkB,OAoEA;AAClB,oFApEA,kBAAG,OAoEA;AACH,uFApEA,qBAAM,OAoEA;AACN,2FApEA,yBAAU,OAoEA;AACV,gGApEA,8BAAe,OAoEA;AACf,6FApEA,2BAAY,OAoEA;AACZ,qGApEA,mCAAoB,OAoEA;AACpB,6FApEA,2BAAY,OAoEA;AACZ,2GApEA,yCAA0B,OAoEA;AAC1B,gGApEA,8BAAe,OAoEA;AACf,8FApEA,4BAAa,OAoEA;AACb,6FApEA,2BAAY,OAoEA;AACZ,uFApEA,qBAAM,OAoEA;AACN,4FApEA,0BAAW,OAoEA;AACX,oGApEA,kCAAmB,OAoEA;AAEnB,iGArEA,+BAAgB,OAqEA;AADhB,6FAnEA,2BAAY,OAmEA;AAEZ,gGApEA,8BAAe,OAoEA;AACf,2FApEA,yBAAU,OAoEA;AACV,4FApEA,0BAAW,OAoEA;AACX,6FApEA,2BAAY,OAoEA;AACZ,yFApEA,uBAAQ,OAoEA;AACR,0FApEA,wBAAS,OAoEA;AACT,2FApEA,yBAAU,OAoEA;AACV,6FApEA,2BAAY,OAoEA;AAUZ,0FA7EA,wBAAS,OA6EA;AAET,wFA7EA,sBAAO,OA6EA;AACP,0FA7EA,wBAAS,OA6EA;AACT,0FA7EA,wBAAS,OA6EA;AACT,mGA7EA,iCAAkB,OA6EA;AAlDlB,6FAxBA,2BAAY,OAwBA;AACZ,2FAxBA,yBAAU,OAwBA;AACV,0FAxBA,wBAAS,OAwBA;AAJT,8FAnBA,4BAAa,OAmBA;AAyDb,0FA3EA,wBAAS,OA2EA;AAxEX,iBAAiB;AACjB,oEAA8C;AAqD5C,qBArDK,oBAAU,CAqDL;AApDZ,8EAAwD;AAqDtD,0BArDK,yBAAe,CAqDL;AApDjB,sEAAgD;AAqD9C,sBArDK,qBAAW,CAqDL;AApDb,0EAAoD;AAqDlD,wBArDK,uBAAa,CAqDL;AApDf,wFAAkE;AAsDhE,+BAtDK,8BAAoB,CAsDL;AArDtB,wGAAkF;AAsDhF,uCAtDK,sCAA4B,CAsDL;AArD9B,kGAA4E;AAmD1E,oCAnDK,mCAAyB,CAmDL"}

package/lib/types/ExpressKitErrorCode.d.ts

@@ -26,6 +26,7 @@ declare enum ExpressKitErrorCode {
     NoOauthLib = "DEK31",
     NoCryptoLib = "DEK32",
     InvalidCrossServerCredentialsFormat = "DEK33",
-    UnknownCrossServerError = "DEK34"
+    UnknownCrossServerError = "DEK34",
+    NotSelectAdmin = "DEK35"
 }
 export default ExpressKitErrorCode;

package/lib/types/ExpressKitErrorCode.js

@@ -33,6 +33,7 @@ var ExpressKitErrorCode;
     ExpressKitErrorCode["NoCryptoLib"] = "DEK32";
     ExpressKitErrorCode["InvalidCrossServerCredentialsFormat"] = "DEK33";
     ExpressKitErrorCode["UnknownCrossServerError"] = "DEK34";
+    ExpressKitErrorCode["NotSelectAdmin"] = "DEK35";
 })(ExpressKitErrorCode || (ExpressKitErrorCode = {}));
 exports.default = ExpressKitErrorCode;
 //# sourceMappingURL=ExpressKitErrorCode.js.map

package/lib/types/ExpressKitErrorCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpressKitErrorCode.js","sourceRoot":"","sources":["../../src/types/ExpressKitErrorCode.ts"],"names":[],"mappings":";AAAA,6BAA6B;;AAE7B;;;GAGG;AACH,IAAK,mBA4BJ;AA5BD,WAAK,mBAAmB;IACtB,iBAAiB;IACjB,2CAAoB,CAAA;IACpB,sCAAe,CAAA;IACf,yCAAkB,CAAA;IAClB,uDAAgC,CAAA;IAChC,gEAAyC,CAAA;IACzC,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;IAEzB,4BAA4B;IAC5B,6CAAsB,CAAA;IACtB,2CAAoB,CAAA;IACpB,mDAA4B,CAAA;IAC5B,yDAAkC,CAAA;IAClC,+DAAwC,CAAA;IACxC,+DAAwC,CAAA;IACxC,0DAAmC,CAAA;IACnC,8DAAuC,CAAA;IACvC,8DAAuC,CAAA;IACvC,yDAAkC,CAAA;IAClC,mEAA4C,CAAA;IAC5C,oEAA6C,CAAA;IAC7C,oEAA6C,CAAA;IAC7C,2CAAoB,CAAA;IACpB,4CAAqB,CAAA;IACrB,oEAA6C,CAAA;IAC7C,wDAAiC,CAAA;AACnC,CAAC,EA5BI,mBAAmB,KAAnB,mBAAmB,QA4BvB;AAED,kBAAe,mBAAmB,CAAC"}
+{"version":3,"file":"ExpressKitErrorCode.js","sourceRoot":"","sources":["../../src/types/ExpressKitErrorCode.ts"],"names":[],"mappings":";AAAA,6BAA6B;;AAE7B;;;GAGG;AACH,IAAK,mBA6BJ;AA7BD,WAAK,mBAAmB;IACtB,iBAAiB;IACjB,2CAAoB,CAAA;IACpB,sCAAe,CAAA;IACf,yCAAkB,CAAA;IAClB,uDAAgC,CAAA;IAChC,gEAAyC,CAAA;IACzC,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;IAEzB,4BAA4B;IAC5B,6CAAsB,CAAA;IACtB,2CAAoB,CAAA;IACpB,mDAA4B,CAAA;IAC5B,yDAAkC,CAAA;IAClC,+DAAwC,CAAA;IACxC,+DAAwC,CAAA;IACxC,0DAAmC,CAAA;IACnC,8DAAuC,CAAA;IACvC,8DAAuC,CAAA;IACvC,yDAAkC,CAAA;IAClC,mEAA4C,CAAA;IAC5C,oEAA6C,CAAA;IAC7C,oEAA6C,CAAA;IAC7C,2CAAoB,CAAA;IACpB,4CAAqB,CAAA;IACrB,oEAA6C,CAAA;IAC7C,wDAAiC,CAAA;IACjC,+CAAwB,CAAA;AAC1B,CAAC,EA7BI,mBAAmB,KAAnB,mBAAmB,QA6BvB;AAED,kBAAe,mBAAmB,CAAC"}

package/lib/types/LogReviewerAdmin.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Type describing a LogReviewerAdmin user
+ * @author Yuen Ler Chow
+ */
+type LogReviewerAdmin = {
+    id: number;
+    userFirstName: string;
+    userLastName: string;
+};
+export default LogReviewerAdmin;

package/lib/types/LogReviewerAdmin.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=LogReviewerAdmin.js.map

package/lib/types/LogReviewerAdmin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LogReviewerAdmin.js","sourceRoot":"","sources":["../../src/types/LogReviewerAdmin.ts"],"names":[],"mappings":""}

package/lib/types/SelectAdmin.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Type describing a SelectAdmin user (subset of Admin)
+ * @author Gardenia Liu
+ */
+type SelectAdmin = {
+    id: number;
+    userFirstName: string;
+    userLastName: string;
+};
+export default SelectAdmin;

package/lib/types/SelectAdmin.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=SelectAdmin.js.map

package/lib/types/SelectAdmin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SelectAdmin.js","sourceRoot":"","sources":["../../src/types/SelectAdmin.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-expresskit",
-  "version": "4.1.0",
+  "version": "4.2.1",
   "description": "Shared functions, helpers, and tools for Harvard DCE Express-based servers",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -25,7 +25,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-logreviewer.1",
+    "dce-reactkit": "^4.1.8",
     "react": "^19.0.0"
   },
   "peerDependencies": {

package/src/helpers/dataSigner.ts

@@ -11,7 +11,7 @@ import oauth from 'oauth-signature';
 import crypto from 'crypto';
 
 // Import shared helpers
-import { internalGetCrossServerCredentialCollection } from './initServer';
+import { internalGetCrossServerCredentialCollection } from './initExpressKitCollections';
 
 // Import shared types
 import ExpressKitErrorCode from '../types/ExpressKitErrorCode';
@@ -240,7 +240,7 @@ export const validateSignedRequest = async (
   /* ------- Look Up Credential ------- */
 
   // Get the cross-server credential collection
-  const crossServerCredentialCollection = internalGetCrossServerCredentialCollection();
+  const crossServerCredentialCollection = await internalGetCrossServerCredentialCollection();
   if (!crossServerCredentialCollection) {
     throw new ErrorWithCode(
       'Could not validate a cross-server request because the cross-server credential collection was not ready in time.',

package/src/helpers/genRouteHandler.ts

@@ -1,7 +1,6 @@
 // Import dce-reactkit
 import {
   getTimeInfoInET,
-  LogFunction,
   Log,
   LogType,
   LogTypeSpecificInfo,
@@ -13,15 +12,14 @@ import {
   ParamType,
   ReactKitErrorCode,
   LogSource,
+  LogFunction,
 } from 'dce-reactkit';
 
 // Import caccl
 import { getLaunchInfo } from 'caccl/server';
 
 // Import caccl functions
-import {
-  internalGetLogCollection,
-} from './initServer';
+import { internalGetLogCollection, internalGetSelectAdminCollection } from './initExpressKitCollections';
 
 // Import shared types
 import ExpressKitErrorCode from '../types/ExpressKitErrorCode';
@@ -563,6 +561,32 @@ const genRouteHandler = (
       );
     }
 
+    // Add Select Admin endpoint security
+    if (
+      // This is a select admin endpoint
+      req.path.startsWith('/api/admin/select')
+    ) {
+      // Get select admin collection
+      const selectAdminCollection = await internalGetSelectAdminCollection();
+      const id = output.userId;
+
+      // Find match if exists in select admin collection
+      const [match] = await selectAdminCollection.find({ id });
+
+      // Check that user exists in select admin collection
+      if (!match) {
+        // User does not have access
+        return handleError(
+          res,
+          {
+            message: 'This action is only allowed for select Canvas admins. Please go back to Canvas, log in as a select admin, and try again.',
+            code: ExpressKitErrorCode.NotSelectAdmin,
+            status: 401,
+          },
+        );
+      }
+    }
+
     /*----------------------------------------*/
     /* ------------- Log Handler ------------ */
     /*----------------------------------------*/
@@ -595,13 +619,27 @@ const genRouteHandler = (
           minute,
         } = getTimeInfoInET();
 
+        // Get user info
+        let userId = (launchInfo ? launchInfo.userId : -1);
+        if (logOpts.userId) {
+          userId = logOpts.userId;
+        }
+        let userFirstName = (launchInfo ? launchInfo.userFirstName : 'unknown');
+        if (logOpts.userFirstName) {
+          userFirstName = logOpts.userFirstName;
+        }
+        let userLastName = (launchInfo ? launchInfo.userLastName : 'unknown');
+        if (logOpts.userLastName) {
+          userLastName = logOpts.userLastName;
+        }
+
         // Main log info
         const mainLogInfo: LogMainInfo = {
           id: `${launchInfo ? launchInfo.userId : 'unknown'}-${Date.now()}-${Math.floor(Math.random() * 100000)}-${Math.floor(Math.random() * 100000)}`,
-          userFirstName: (launchInfo ? launchInfo.userFirstName : 'unknown'),
-          userLastName: (launchInfo ? launchInfo.userLastName : 'unknown'),
+          userFirstName,
+          userLastName,
           userEmail: (launchInfo ? launchInfo.userEmail : 'unknown'),
-          userId: (launchInfo ? launchInfo.userId : -1),
+          userId,
           isLearner: (launchInfo && !!launchInfo.isLearner),
           isAdmin: (launchInfo && !!launchInfo.isAdmin),
           isTTM: (launchInfo && !!launchInfo.isTTM),
@@ -675,7 +713,7 @@ const genRouteHandler = (
         };
 
         // Either print to console or save to db
-        const logCollection = internalGetLogCollection();
+        const logCollection = await internalGetLogCollection();
         if (logCollection) {
           // Store to the log collection
           await logCollection.insert(log);

package/src/helpers/initExpressKitCollections.ts

@@ -0,0 +1,144 @@
+// Import dce-mango
+import { Collection as MangoCollection } from 'dce-mango';
+
+// Import dce-reactkit
+import { Log } from 'dce-reactkit';
+
+// Import shared types
+import CrossServerCredential from '../types/CrossServerCredential';
+import SelectAdmin from '../types/SelectAdmin';
+import LogReviewerAdmin from '../types/LogReviewerAdmin';
+
+/*------------------------------------------------------------------------*/
+/* ------------------------- Collection Storage ------------------------- */
+/*------------------------------------------------------------------------*/
+
+// Variables to store collections
+let logCollection: MangoCollection<Log>;
+let crossServerCredentialCollection: MangoCollection<CrossServerCredential>;
+let selectAdminCollection: MangoCollection<SelectAdmin>;
+let logReviewerAdminCollection: MangoCollection<LogReviewerAdmin>;
+
+// Promise that resolves when all collections are initialized
+let collectionsInitializedResolve: (v?: unknown) => void;
+let collectionsInitializedReject: (error: Error) => void;
+const collectionsInitialized = new Promise((resolve, reject) => {
+  collectionsInitializedResolve = resolve;
+  collectionsInitializedReject = reject;
+});
+
+/*------------------------------------------------------------------------*/
+/* ------------------------- Collection Getters ------------------------- */
+/*------------------------------------------------------------------------*/
+
+/**
+ * Get the log collection after initialization
+ * @author Gardenia Liu
+ */
+export const internalGetLogCollection = async () => {
+  // Wait for collections to be initialized
+  await collectionsInitialized;
+
+  // Return the log collection
+  return logCollection;
+};
+
+/**
+ * Get the cross server credential collection after initialization
+ * @author Gardenia Liu
+ */
+export const internalGetCrossServerCredentialCollection = async () => {
+  // Wait for collections to be initialized
+  await collectionsInitialized;
+
+  // Return the cross server credential collection
+  return crossServerCredentialCollection;
+};
+
+/**
+ * Get the select admin collection after initialization
+ * @author Gardenia Liu
+ */
+export const internalGetSelectAdminCollection = async () => {
+  // Wait for collections to be initialized
+  await collectionsInitialized;
+
+  // Return the cross server credential collection
+  return selectAdminCollection;
+};
+
+/**
+ * Get the log reviewer admin collection after initialization
+ * @author Yuen Ler Chow
+ */
+export const internalGetLogReviewerAdminCollection = async () => {
+  // Wait for collections to be initialized
+  await collectionsInitialized;
+
+  // Return the log reviewer admin collection
+  return logReviewerAdminCollection;
+};
+
+/*------------------------------------------------------------------------*/
+/* -------------------------------- Main -------------------------------- */
+/*------------------------------------------------------------------------*/
+
+/**
+ * Initialize all collections required for expresskit
+ * @author Gardenia Liu
+ * @author Gabe Abrams
+ * @param Collection the Collection class from dce-mango
+ */
+const initExpressKitCollections = (Collection: typeof MangoCollection) => {
+  try {
+    // Create and store log collection
+    logCollection = new Collection<Log>(
+      'Log',
+      {
+        uniqueIndexKey: 'id',
+        indexKeys: [
+          'courseId',
+          'context',
+          'subcontext',
+          'tags',
+          'year',
+          'month',
+          'day',
+          'hour',
+          'type',
+        ],
+      },
+    );
+
+    // Create and store cross server credential collection
+    crossServerCredentialCollection = new Collection<CrossServerCredential>(
+      'CrossServerCredential',
+      {
+        uniqueIndexKey: 'key',
+      },
+    );
+
+    // Create and store select admin collection
+    selectAdminCollection = new Collection<SelectAdmin>(
+      'SelectAdmin',
+      {
+        uniqueIndexKey: 'id',
+      },
+    );
+
+    // Create and store log reviewer admin collection
+    logReviewerAdminCollection = new Collection<LogReviewerAdmin>(
+      'LogReviewerAdmin',
+      {
+        uniqueIndexKey: 'id',
+      },
+    );
+
+    // Finished! Resolve the promise
+    collectionsInitializedResolve();
+  } catch (err) {
+    return collectionsInitializedReject(err as Error);
+  }
+};
+
+export default initExpressKitCollections;