@openstax/ts-utils 1.38.3 → 1.39.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,6 +3,7 @@ import { VerifyConfig } from 'http-message-signatures';
3
3
  import { JWK } from 'node-jose';
4
4
  import { ConfigProviderForConfig } from '../../config';
5
5
  type Config = {
6
+ apiHost: string;
6
7
  bypassSignatureVerification: string;
7
8
  };
8
9
  interface Initializer<C> {
@@ -9,6 +9,7 @@ import { once } from '../../misc/helpers';
9
9
  import { getJwksClient } from '../../misc/jwks';
10
10
  export const createHttpMessageVerifier = ({ configSpace, fetcher }) => (configProvider) => {
11
11
  const config = configProvider[configSpace !== null && configSpace !== void 0 ? configSpace : 'verifier'];
12
+ const getApiHost = once(async () => await resolveConfigValue(config.apiHost));
12
13
  const getBypassSignatureVerification = once(async () => (await resolveConfigValue(config.bypassSignatureVerification)) === 'true');
13
14
  return ({ request }) => ({
14
15
  verify: async ({ configOverride, signatureAgentVerifier }) => {
@@ -41,8 +42,7 @@ export const createHttpMessageVerifier = ({ configSpace, fetcher }) => (configPr
41
42
  body,
42
43
  headers,
43
44
  method: requestContext.http.method,
44
- // Node's request.url is really just the path and querystring
45
- url: requestContext.http.path,
45
+ url: `${await getApiHost()}${requestContext.http.path}${request.rawQueryString ? `?${request.rawQueryString}` : ''}`,
46
46
  };
47
47
  if (!await httpbis.verifyMessage({
48
48
  all: true,
@@ -1,5 +1,6 @@
1
- import { User } from '../authProvider';
2
1
  import { EagerXapiStatement, UXapiStatement, XapiStatement } from '.';
3
2
  export declare const addStatementDefaultFields: (statement: (Pick<XapiStatement, "object" | "verb" | "context" | "result"> & {
4
3
  id?: string;
5
- }) | UXapiStatement, user: User) => EagerXapiStatement;
4
+ }) | UXapiStatement, user: {
5
+ uuid: string;
6
+ }) => EagerXapiStatement;
@@ -79,7 +79,7 @@ export declare const putAttemptStatement: (gateway: LrsGateway, activity: {
79
79
  export declare const createAttemptActivityStatement: (attemptStatement: UXapiStatement, verb: UXapiStatement["verb"], result?: UXapiStatement["result"]) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
80
80
  export declare const putAttemptActivityStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, verb: UXapiStatement["verb"], result?: UXapiStatement["result"]) => Promise<import(".").EagerXapiStatement>;
81
81
  export declare const createCompletedStatement: (attemptStatement: UXapiStatement, result?: UXapiStatement["result"]) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
82
- export declare const putCompletedStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"]) => Promise<import(".").EagerXapiStatement>;
82
+ export declare const putCompletedStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"], user?: string) => Promise<import(".").EagerXapiStatement>;
83
83
  export declare const createCompletedPendingScoringStatement: (attemptStatement: UXapiStatement) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
84
84
  export declare const putCompletedPendingScoringStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement) => Promise<import(".").EagerXapiStatement>;
85
85
  export declare const createScoredStatement: (attemptStatement: UXapiStatement, result: UXapiStatement["result"]) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
@@ -288,8 +288,8 @@ export const createCompletedStatement = (attemptStatement, result) => {
288
288
  }
289
289
  };
290
290
  };
291
- export const putCompletedStatement = async (gateway, attemptStatement, result) => {
292
- return (await gateway.putXapiStatements([createCompletedStatement(attemptStatement, result)]))[0];
291
+ export const putCompletedStatement = async (gateway, attemptStatement, result, user) => {
292
+ return (await gateway.putXapiStatements([createCompletedStatement(attemptStatement, result)], user))[0];
293
293
  };
294
294
  // pending score statement for when the open written response has been graded.
295
295
  export const createCompletedPendingScoringStatement = (attemptStatement) => createCompletedStatement(attemptStatement, {
@@ -84,7 +84,7 @@ export declare const lrsGateway: <C extends string = "lrs">(initializer: Initial
84
84
  }) => {
85
85
  putXapiStatements: (statements: Array<(Pick<XapiStatement, "object" | "verb" | "context" | "result"> & {
86
86
  id?: string;
87
- }) | UXapiStatement>) => Promise<EagerXapiStatement[]>;
87
+ }) | UXapiStatement>, user?: string) => Promise<EagerXapiStatement[]>;
88
88
  getXapiStatements: (params: {
89
89
  verb?: string;
90
90
  activity?: string;
@@ -20,9 +20,11 @@ export const lrsGateway = (initializer) => (configProvider) => {
20
20
  status: [502]
21
21
  });
22
22
  // Note: This method actually uses POST
23
- const putXapiStatements = async (statements) => {
24
- const user = assertDefined(await authProvider.getUser(), new UnauthorizedError);
25
- const statementsWithDefaults = statements.map(statement => addStatementDefaultFields(statement, user));
23
+ const putXapiStatements = async (statements, user) => {
24
+ const userObj = user
25
+ ? { uuid: user }
26
+ : assertDefined(await authProvider.getUser(), new UnauthorizedError);
27
+ const statementsWithDefaults = statements.map(statement => addStatementDefaultFields(statement, userObj));
26
28
  const response = await fetcher((await lrsHost()).replace(/\/+$/, '') + '/data/xAPI/statements', {
27
29
  body: JSON.stringify(statementsWithDefaults),
28
30
  headers: {