@openstax/ts-utils 1.5.7 → 1.6.0

package/dist/cjs/services/authProvider/browser.d.ts

@@ -15,8 +15,7 @@ export declare type EventHandler = (e: {
 }) => void;
 export interface Window {
     fetch: GenericFetch;
-    top: {} | null;
-    parent: Pick<Window, 'postMessage'> | null;
+    parent: Pick<Window, 'postMessage'>;
     location: {
         search: string;
     };

package/dist/cjs/services/authProvider/browser.js

@@ -4,7 +4,9 @@ exports.browserAuthProvider = void 0;
 const __1 = require("../..");
 const config_1 = require("../../config");
 const guards_1 = require("../../guards");
+const helpers_1 = require("../../routing/helpers");
 const embeddedAuthProvider_1 = require("./utils/embeddedAuthProvider");
+const isUserData = (0, helpers_1.unsafePayloadValidator)();
 const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
     const config = configProvider[(0, guards_1.ifDefined)(configSpace, 'auth')];
     const accountsBase = (0, __1.once)(() => (0, config_1.resolveConfigValue)(config.accountsBase));
@@ -12,7 +14,7 @@ const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
     const queryKey = 'auth';
     const authQuery = new URLSearchParams(queryString).get(queryKey);
     const referrer = window.document.referrer ? new URL(window.document.referrer) : undefined;
-    const isEmbedded = window.top && window.top !== window;
+    const isEmbedded = window.parent !== window;
     const trustedParent = isEmbedded && referrer && referrer.hostname.match(/^(openstax\.org|((.*)(\.openstax\.org|local|localhost)))$/) ? referrer : undefined;
     const { embeddedQueryValue, getAuthorizedEmbedUrl } = (0, embeddedAuthProvider_1.embeddedAuthProvider)(() => getUserData(), { queryKey, window });
     let userData = {
@@ -71,12 +73,11 @@ const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
      * requests user identity from accounts api using given token or cookie
      */
     const getFetchUser = async () => {
-        const response = await window.fetch((await accountsBase()).replace(/\/+$/, '') + '/api/user', getAuthorizedFetchConfigFromData(userData));
+        const response = await window.fetch((await accountsBase()).replace(/\/+$/, '') + '/api/user?always_200=true', getAuthorizedFetchConfigFromData(userData));
         if (response.status === 200) {
-            return { ...userData, user: await response.json() };
-        }
-        if (response.status === 403) {
-            return { ...userData, user: undefined };
+            const body = await response.json();
+            const user = isUserData(body) ? body : undefined;
+            return { ...userData, user };
         }
         const message = await response.text();
         throw new Error(`Error response from Accounts ${response.status}: ${message}`);

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

@@ -12,8 +12,10 @@ export interface Grade {
     userId: string;
 }
 export declare const getRegistrationAttemptInfo: (lrs: LrsGateway, registration: string, options?: {
+    activity?: string | undefined;
     anyUser?: boolean | undefined;
     currentPreference?: "latest" | "oldest" | undefined;
+    ensureSync?: boolean | undefined;
     user?: string | undefined;
 } | undefined) => Promise<{
     [key: string]: ActivityState;
@@ -47,7 +49,7 @@ export declare const getAssignmentGrades: (services: {
     accountsGateway: AccountsGateway;
     lrs: LrsGateway;
     logger: Logger;
-}, registration: string, options?: {
+}, assignmentIRI: string, registration: string, options?: {
     anyUser?: boolean | undefined;
     currentPreference?: "latest" | "oldest" | undefined;
     incompleteAttemptsCallback?: ((mappedInfo: UserActivityInfo[]) => Promise<GradeAndProgress[]>) | undefined;

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

@@ -9,7 +9,7 @@ const __1 = require("../..");
 const attempt_utils_1 = require("./attempt-utils");
 const getRegistrationAttemptInfo = async (lrs, registration, options) => {
     const { currentPreference, ...xapiOptions } = options !== null && options !== void 0 ? options : {};
-    const allStatements = await lrs.getAllXapiStatements({ ...xapiOptions, registration, ensureSync: true });
+    const allStatements = await lrs.getAllXapiStatements({ ...xapiOptions, registration });
     // Partition statements for each user
     const statementsPerUser = {};
     allStatements.forEach((statement) => {
@@ -78,9 +78,9 @@ const getCurrentGrade = async (services, registration, options) => {
     return incompleteAttemptCallback(userInfo);
 };
 exports.getCurrentGrade = getCurrentGrade;
-const getAssignmentGrades = async (services, registration, options) => {
+const getAssignmentGrades = async (services, assignmentIRI, registration, options) => {
     const { anyUser, currentPreference, incompleteAttemptsCallback, platformId, scoreMaximum, user } = options !== null && options !== void 0 ? options : {};
-    const infoPerUserUuid = await (0, exports.getRegistrationAttemptInfo)(services.lrs, registration, { anyUser, currentPreference, user });
+    const infoPerUserUuid = await (0, exports.getRegistrationAttemptInfo)(services.lrs, registration, { activity: assignmentIRI, anyUser, currentPreference, user });
     const mappedInfo = await services.accountsGateway.mapUserUuids(infoPerUserUuid, services.logger, platformId);
     if (!incompleteAttemptsCallback) {
         return getCompletedUserInfosGradeAndProgress(mappedInfo, scoreMaximum);