@openstax/ts-utils 1.38.2 → 1.39.0

package/dist/cjs/services/httpMessageVerifier/index.d.ts

@@ -3,6 +3,7 @@ import { VerifyConfig } from 'http-message-signatures';
 import { JWK } from 'node-jose';
 import { ConfigProviderForConfig } from '../../config';
 type Config = {
+    apiHost: string;
     bypassSignatureVerification: string;
 };
 interface Initializer<C> {

package/dist/cjs/services/httpMessageVerifier/index.js

@@ -12,6 +12,7 @@ const helpers_1 = require("../../misc/helpers");
 const jwks_1 = require("../../misc/jwks");
 const createHttpMessageVerifier = ({ configSpace, fetcher }) => (configProvider) => {
     const config = configProvider[configSpace !== null && configSpace !== void 0 ? configSpace : 'verifier'];
+    const getApiHost = (0, helpers_1.once)(async () => await (0, config_1.resolveConfigValue)(config.apiHost));
     const getBypassSignatureVerification = (0, helpers_1.once)(async () => (await (0, config_1.resolveConfigValue)(config.bypassSignatureVerification)) === 'true');
     return ({ request }) => ({
         verify: async ({ configOverride, signatureAgentVerifier }) => {
@@ -44,8 +45,7 @@ const createHttpMessageVerifier = ({ configSpace, fetcher }) => (configProvider)
                 body,
                 headers,
                 method: requestContext.http.method,
-                // Node's request.url is really just the path and querystring
-                url: requestContext.http.path,
+                url: `${await getApiHost()}${requestContext.http.path}${request.rawQueryString ? `?${request.rawQueryString}` : ''}`,
             };
             if (!await http_message_signatures_1.httpbis.verifyMessage({
                 all: true,

package/dist/cjs/services/launchParams/verifier.js

@@ -54,7 +54,7 @@ const createLaunchVerifier = ({ configSpace, fetcher }) => (configProvider) => {
             return callback(new Error('JWT header missing iss claim'));
         }
         try {
-            const domain = new URL(iss).host;
+            const domain = new URL(iss).hostname;
             const trustedDomain = await getTrustedDomain();
             if (domain !== trustedDomain && !domain.endsWith(`.${trustedDomain}`)) {
                 return callback(new Error(`Untrusted JWKS domain: "${domain}"`));

package/dist/cjs/services/lrsGateway/addStatementDefaultFields.d.ts

@@ -1,5 +1,6 @@
-import { User } from '../authProvider';
 import { EagerXapiStatement, UXapiStatement, XapiStatement } from '.';
 export declare const addStatementDefaultFields: (statement: (Pick<XapiStatement, "object" | "verb" | "context" | "result"> & {
     id?: string;
-}) | UXapiStatement, user: User) => EagerXapiStatement;
+}) | UXapiStatement, user: {
+    uuid: string;
+}) => EagerXapiStatement;

package/dist/cjs/services/lrsGateway/attempt-utils.d.ts

@@ -79,7 +79,7 @@ export declare const putAttemptStatement: (gateway: LrsGateway, activity: {
 export declare const createAttemptActivityStatement: (attemptStatement: UXapiStatement, verb: UXapiStatement["verb"], result?: UXapiStatement["result"]) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
 export declare const putAttemptActivityStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, verb: UXapiStatement["verb"], result?: UXapiStatement["result"]) => Promise<import(".").EagerXapiStatement>;
 export declare const createCompletedStatement: (attemptStatement: UXapiStatement, result?: UXapiStatement["result"]) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
-export declare const putCompletedStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"]) => Promise<import(".").EagerXapiStatement>;
+export declare const putCompletedStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"], user?: string) => Promise<import(".").EagerXapiStatement>;
 export declare const createCompletedPendingScoringStatement: (attemptStatement: UXapiStatement) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
 export declare const putCompletedPendingScoringStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement) => Promise<import(".").EagerXapiStatement>;
 export declare const createScoredStatement: (attemptStatement: UXapiStatement, result: UXapiStatement["result"]) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;

package/dist/cjs/services/lrsGateway/attempt-utils.js

@@ -311,8 +311,8 @@ const createCompletedStatement = (attemptStatement, result) => {
     };
 };
 exports.createCompletedStatement = createCompletedStatement;
-const putCompletedStatement = async (gateway, attemptStatement, result) => {
-    return (await gateway.putXapiStatements([(0, exports.createCompletedStatement)(attemptStatement, result)]))[0];
+const putCompletedStatement = async (gateway, attemptStatement, result, user) => {
+    return (await gateway.putXapiStatements([(0, exports.createCompletedStatement)(attemptStatement, result)], user))[0];
 };
 exports.putCompletedStatement = putCompletedStatement;
 // pending score statement for when the open written response has been graded.

package/dist/cjs/services/lrsGateway/index.d.ts

@@ -84,7 +84,7 @@ export declare const lrsGateway: <C extends string = "lrs">(initializer: Initial
 }) => {
     putXapiStatements: (statements: Array<(Pick<XapiStatement, "object" | "verb" | "context" | "result"> & {
         id?: string;
-    }) | UXapiStatement>) => Promise<EagerXapiStatement[]>;
+    }) | UXapiStatement>, user?: string) => Promise<EagerXapiStatement[]>;
     getXapiStatements: (params: {
         verb?: string;
         activity?: string;

package/dist/cjs/services/lrsGateway/index.js

@@ -56,9 +56,11 @@ const lrsGateway = (initializer) => (configProvider) => {
             status: [502]
         });
         // Note: This method actually uses POST
-        const putXapiStatements = async (statements) => {
-            const user = (0, assertions_1.assertDefined)(await authProvider.getUser(), new errors_1.UnauthorizedError);
-            const statementsWithDefaults = statements.map(statement => (0, addStatementDefaultFields_1.addStatementDefaultFields)(statement, user));
+        const putXapiStatements = async (statements, user) => {
+            const userObj = user
+                ? { uuid: user }
+                : (0, assertions_1.assertDefined)(await authProvider.getUser(), new errors_1.UnauthorizedError);
+            const statementsWithDefaults = statements.map(statement => (0, addStatementDefaultFields_1.addStatementDefaultFields)(statement, userObj));
             const response = await fetcher((await lrsHost()).replace(/\/+$/, '') + '/data/xAPI/statements', {
                 body: JSON.stringify(statementsWithDefaults),
                 headers: {